# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1227624344 0
# Node ID 5cbf2da3a32455fcee35b63d4788e99f19c07ca0
# Parent  3983e673cd40cb0fcfb8f8bba863d9c02c2702ca
fix segfault on close error

diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c
--- 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) {