# HG changeset patch
# User Tatsuhiko Kubo <cubicdaiya@gmail.com>
# Date 1406891054 -32400
# Node ID f87afb46ccd26fccc7ed55ca8a7ef89c6256c3f2
# Parent  dc7c139fca219b77b219671412b032f43d7bca86
Core: improved ngx_pstrdup() error handling.

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
@@ -781,6 +781,9 @@ ngx_conf_include(ngx_conf_t *cf, ngx_com
 
         file.len = name.len++;
         file.data = ngx_pstrdup(cf->pool, &name);
+        if (file.data == NULL) {
+            return NGX_CONF_ERROR;
+        }
 
         ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);