Mercurial > hg > nginx
changeset 7943:2a7155733855
Core: removed unnecessary restriction in hash initialization.
Hash initialization ignores elements with key.data set to NULL.
Nevertheless, the initial hash bucket size check didn't skip them,
resulting in unnecessary restrictions on, for example, variables with
long names and with the NGX_HTTP_VARIABLE_NOHASH flag.
Fix is to update the initial hash bucket size check to skip elements
with key.data set to NULL, similarly to how it is done in other parts
of the code.
author | Alexey Radkov <alexey.radkov@gmail.com> |
---|---|
date | Thu, 19 Aug 2021 20:51:27 +0300 |
parents | 3f0ab7b6cd71 |
children | 24f7904dbfa0 |
files | src/core/ngx_hash.c |
diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_hash.c Mon Oct 25 20:49:15 2021 +0300 +++ b/src/core/ngx_hash.c Thu Aug 19 20:51:27 2021 +0300 @@ -274,6 +274,10 @@ } for (n = 0; n < nelts; n++) { + if (names[n].key.data == NULL) { + continue; + } + if (hinit->bucket_size < NGX_HASH_ELT_SIZE(&names[n]) + sizeof(void *)) { ngx_log_error(NGX_LOG_EMERG, hinit->pool->log, 0,