You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2004/01/16 21:11:13 UTC

cvs commit: httpd-2.0/modules/http http_protocol.c

trawick     2004/01/16 12:11:13

  Modified:    .        CHANGES
               modules/http http_protocol.c
  Log:
  Build array of allowed methods with proper dimensions, fixing
  possible memory corruption.
  
  Revision  Changes    Path
  1.1370    +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1369
  retrieving revision 1.1370
  diff -u -r1.1369 -r1.1370
  --- CHANGES	14 Jan 2004 00:41:25 -0000	1.1369
  +++ CHANGES	16 Jan 2004 20:11:12 -0000	1.1370
  @@ -2,6 +2,9 @@
   
     [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]
   
  
  
  
  1.476     +1 -1      httpd-2.0/modules/http/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
  retrieving revision 1.475
  retrieving revision 1.476
  diff -u -r1.475 -r1.476
  --- http_protocol.c	1 Jan 2004 13:26:19 -0000	1.475
  +++ http_protocol.c	16 Jan 2004 20:11:12 -0000	1.476
  @@ -2487,7 +2487,7 @@
   
       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;
   }