technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Initializing application structure with 0 to avoid crash.

Browse Source 
Attribute 'application' is optional in listener object.  This commit adds
missing code to reset 'lscf' to avoid garbage and crash when the attribute
is absent.
This commit is contained in:
Max Romanov
2018-09-19 19:24:56 +03:00
parent 5ef1352fae
commit e964e982fd
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nxt_router.c
View File

@@ -1545,6 +1545,8 @@ nxt_router_conf_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
goto fail; goto fail;
} }
nxt_memzero(&lscf, sizeof(lscf));
ret = nxt_conf_map_object(mp, listener, nxt_router_listener_conf, ret = nxt_conf_map_object(mp, listener, nxt_router_listener_conf,
nxt_nitems(nxt_router_listener_conf), &lscf); nxt_nitems(nxt_router_listener_conf), &lscf);
if (ret != NXT_OK) { if (ret != NXT_OK) {
@@ -1577,9 +1579,12 @@ nxt_router_conf_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf,
skcf->listen->handler = nxt_http_conn_init; skcf->listen->handler = nxt_http_conn_init;
skcf->router_conf = tmcf->router_conf; skcf->router_conf = tmcf->router_conf;
skcf->router_conf->count++; skcf->router_conf->count++;
skcf->application = nxt_router_listener_application(tmcf,
if (lscf.application.length > 0) {
skcf->application = nxt_router_listener_application(tmcf,
&lscf.application); &lscf.application);
nxt_router_app_use(task, skcf->application, 1); nxt_router_app_use(task, skcf->application, 1);
}
} }
value = nxt_conf_get_path(conf, &access_log_path); value = nxt_conf_get_path(conf, &access_log_path);