From c54899ddfd9d517b01e09fc3e57b497a8f019686 Mon Sep 17 00:00:00 2001 From: Vladimir Homutov Date: Thu, 24 Jul 2014 16:25:07 +0400 Subject: [PATCH] Core: fixed default log initialization. The ngx_log_insert() function may invalidate pointer passed to it, so make sure to don't use it after the ngx_log_insert() call. --- src/core/ngx_log.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c index 375d52f65..005d9ff88 100644 --- a/src/core/ngx_log.c +++ b/src/core/ngx_log.c @@ -387,20 +387,22 @@ ngx_log_open_default(ngx_cycle_t *cycle) return NGX_ERROR; } - log->log_level = NGX_LOG_ERR; - ngx_log_insert(&cycle->new_log, log); - } else { /* no error logs at all */ log = &cycle->new_log; - log->log_level = NGX_LOG_ERR; } + log->log_level = NGX_LOG_ERR; + log->file = ngx_conf_open_file(cycle, &error_log); if (log->file == NULL) { return NGX_ERROR; } + if (log != &cycle->new_log) { + ngx_log_insert(&cycle->new_log, log); + } + return NGX_OK; }