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 178a964ddfd996cbc22b28d9eba5c025daee7fd0..42b3d3d20f2de8f3067819b9f56da24d9ed6bfe1 100644 (file)
--- 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 23528afc7b0c0e0b986a1446c1bb1b66151744a1..4659d9870af7d121468247a6bcc21461ba64a9c8 100644 (file)
--- 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;
 }