From: Alexey Radkov <alexey.radkov@gmail.com>
Date: Thu, 19 Aug 2021 17:51:27 +0000 (+0300)
Subject: Core: removed unnecessary restriction in hash initialization.
X-Git-Tag: release-1.21.4~9
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=3253b346fb8b067d68a79ae72e08a376f234b0b3;p=nginx.git

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.
---

diff --git a/src/core/ngx_hash.c b/src/core/ngx_hash.c
index d9c157c1d..8215c2717 100644
--- a/src/core/ngx_hash.c
+++ b/src/core/ngx_hash.c
@@ -274,6 +274,10 @@ ngx_hash_init(ngx_hash_init_t *hinit, ngx_hash_key_t *names, ngx_uint_t nelts)
     }
 
     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,