Mercurial > hg > nginx

changeset 2338:5cbf2da3a324

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix segfault on close error
author Igor Sysoev <igor@sysoev.ru>
date Tue, 25 Nov 2008 14:45:44 +0000
parents 3983e673cd40
children 2142237f66da
files src/core/ngx_conf_file.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -258,14 +258,14 @@ done:
     if (filename) {
         ngx_free(cf->conf_file->buffer->start);
 
-        cf->conf_file = prev;
-
         if (ngx_close_file(fd) == NGX_FILE_ERROR) {
             ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno,
                           ngx_close_file_n " %s failed",
                           cf->conf_file->file.name.data);
             return NGX_CONF_ERROR;
         }
+
+        cf->conf_file = prev;
     }
 
     if (rc == NGX_ERROR) {