From: Jeff Trawick <trawick@apache.org>
Date: Fri, 16 Jan 2004 20:11:12 +0000 (+0000)
Subject: Build array of allowed methods with proper dimensions, fixing
X-Git-Tag: pre_ajp_proxy~794
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3f81752cf867beba7a76d719fe79277cdc28090;p=apache

Build array of allowed methods with proper dimensions, fixing
possible memory corruption.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102354 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 178a964ddf..42b3d3d20f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Build array of allowed methods with proper dimensions, fixing
+     possible memory corruption.  [Jeff Trawick]
+
   *) Allow proxying of resources that are invoked via DirectoryIndex.
      PR 14648.  [André Malo]
 
diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 23528afc7b..4659d9870a 100644
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -2487,7 +2487,7 @@ AP_DECLARE(ap_method_list_t *) ap_make_method_list(apr_pool_t *p, int nelts)
 
     ml = (ap_method_list_t *) apr_palloc(p, sizeof(ap_method_list_t));
     ml->method_mask = 0;
-    ml->method_list = apr_array_make(p, sizeof(char *), nelts);
+    ml->method_list = apr_array_make(p, nelts, sizeof(char *));
     return ml;
 }