Skip to content

Commit 7d585bd

Browse files
author
Johnny Wang
authored
bugfix: fixed size of the array when initialized in the init_worker_by* phase. (openresty#2017)
1 parent 66294b9 commit 7d585bd

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/ngx_http_lua_initworkerby.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,15 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
118118
ngx_queue_init(&fake_cycle->reusable_connections_queue);
119119

120120
if (ngx_array_init(&fake_cycle->listening, cycle->pool,
121-
cycle->listening.nelts || 1,
121+
cycle->listening.nelts ? cycle->listening.nelts : 1,
122122
sizeof(ngx_listening_t))
123123
!= NGX_OK)
124124
{
125125
goto failed;
126126
}
127127

128-
if (ngx_array_init(&fake_cycle->paths, cycle->pool, cycle->paths.nelts || 1,
128+
if (ngx_array_init(&fake_cycle->paths, cycle->pool,
129+
cycle->paths.nelts ? cycle->paths.nelts : 1,
129130
sizeof(ngx_path_t *))
130131
!= NGX_OK)
131132
{
@@ -135,7 +136,8 @@ ngx_http_lua_init_worker(ngx_cycle_t *cycle)
135136
part = &cycle->open_files.part;
136137
ofile = part->elts;
137138

138-
if (ngx_list_init(&fake_cycle->open_files, cycle->pool, part->nelts || 1,
139+
if (ngx_list_init(&fake_cycle->open_files, cycle->pool,
140+
part->nelts ? part->nelts : 1,
139141
sizeof(ngx_open_file_t))
140142
!= NGX_OK)
141143
{

0 commit comments

Comments
 (0)