artox/incubator-pagespeed-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix error handling in ps_create_XXX_conf (#1625)

Browse Source 
Return NULL instead of NGX_CONF_ERROR when config creation fails.

Fixes https://github.com/apache/incubator-pagespeed-ngx/issues/1623
This commit is contained in:
Otto van der Schaaf
2019-02-10 23:42:44 +01:00
committed by GitHub
parent f73a591738
commit c69649ab0a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ngx_pagespeed.cc
+3 -3
View File
@@ -1028,7 +1028,7 @@ void* ps_create_main_conf(ngx_conf_t* cf) {
} }
ps_main_conf_t* cfg_m = ps_create_conf<ps_main_conf_t>(cf); ps_main_conf_t* cfg_m = ps_create_conf<ps_main_conf_t>(cf);
if (cfg_m == NULL) { if (cfg_m == NULL) {
return NGX_CONF_ERROR; return NULL;
} }
CHECK(!factory_deleted); CHECK(!factory_deleted);
NgxRewriteOptions::Initialize(); NgxRewriteOptions::Initialize();
@@ -1049,7 +1049,7 @@ void* ps_create_main_conf(ngx_conf_t* cf) {
void* ps_create_srv_conf(ngx_conf_t* cf) { void* ps_create_srv_conf(ngx_conf_t* cf) {
ps_srv_conf_t* cfg_s = ps_create_conf<ps_srv_conf_t>(cf); ps_srv_conf_t* cfg_s = ps_create_conf<ps_srv_conf_t>(cf);
if (cfg_s == NULL) { if (cfg_s == NULL) {
return NGX_CONF_ERROR; return NULL;
} }
ps_set_conf_cleanup_handler(cf, ps_cleanup_srv_conf, cfg_s); ps_set_conf_cleanup_handler(cf, ps_cleanup_srv_conf, cfg_s);
return cfg_s; return cfg_s;
@@ -1058,7 +1058,7 @@ void* ps_create_srv_conf(ngx_conf_t* cf) {
void* ps_create_loc_conf(ngx_conf_t* cf) { void* ps_create_loc_conf(ngx_conf_t* cf) {
ps_loc_conf_t* cfg_l = ps_create_conf<ps_loc_conf_t>(cf); ps_loc_conf_t* cfg_l = ps_create_conf<ps_loc_conf_t>(cf);
if (cfg_l == NULL) { if (cfg_l == NULL) {
return NGX_CONF_ERROR; return NULL;
} }
ps_set_conf_cleanup_handler(cf, ps_cleanup_loc_conf, cfg_l); ps_set_conf_cleanup_handler(cf, ps_cleanup_loc_conf, cfg_l);
return cfg_l; return cfg_l;