From: Maxim Dounin <mdounin@mdounin.ru>
Date: Wed, 25 Jun 2014 23:34:13 +0000 (+0400)
Subject: Fixed wrong sizeof() in ngx_http_init_locations().
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=25250a20d2827954d427222f1f4b1e26c8729d7f;p=nginx.git

Fixed wrong sizeof() in ngx_http_init_locations().

There is no real difference on all known platforms, but it's still wrong.

Found by Coverity (CID 400876).
---

diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index ce5adb737..31577f9a2 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -742,7 +742,7 @@ ngx_http_init_locations(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
 
     if (named) {
         clcfp = ngx_palloc(cf->pool,
-                           (n + 1) * sizeof(ngx_http_core_loc_conf_t **));
+                           (n + 1) * sizeof(ngx_http_core_loc_conf_t *));
         if (clcfp == NULL) {
             return NGX_ERROR;
         }
@@ -768,7 +768,7 @@ ngx_http_init_locations(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf,
     if (regex) {
 
         clcfp = ngx_palloc(cf->pool,
-                           (r + 1) * sizeof(ngx_http_core_loc_conf_t **));
+                           (r + 1) * sizeof(ngx_http_core_loc_conf_t *));
         if (clcfp == NULL) {
             return NGX_ERROR;
         }