svn commit: r602536 - in /httpd/httpd/branches/2.2.x: STATUS server/protocol.c

[ji...@apache.org]

Author: jim
Date: Sat Dec  8 11:33:47 2007
New Revision: 602536

URL: http://svn.apache.org/viewvc?rev=602536&view=rev
Log:
Merge r589461, r602491 from trunk:

Prevent 1-byte overflow on 8192 boundary (see PR 43310)


Alternate fix... profiling indicates that the string
termination is completely unneeded and superflous. In
which case, the original allocation size is sufficient
since nothing external worries about a NULL nor
looks for it.

Reviewed by: jim

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/server/protocol.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=602536&r1=602535&r2=602536&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sat Dec  8 11:33:47 2007
@@ -79,14 +79,6 @@
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * server/protocol.c: Prevent 1-byte overflow on 8192 boundary in
-    ap_vrprintf(). PR 43310
-    trunk:
-       http://svn.apache.org/viewvc?view=rev&revision=589461
-       http://svn.apache.org/viewvc?view=rev&revision=602491
-    2.2.x:
-       Trunk version of patch works
-    +1: jim, rpluem, niq
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

Modified: httpd/httpd/branches/2.2.x/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/protocol.c?rev=602536&r1=602535&r2=602536&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/protocol.c (original)
+++ httpd/httpd/branches/2.2.x/server/protocol.c Sat Dec  8 11:33:47 2007
@@ -1539,9 +1539,6 @@
 
     written = apr_vformatter(r_flush, &vd.vbuff, fmt, va);
 
-    /* tack on null terminator on remaining string */
-    *(vd.vbuff.curpos) = '\0';
-
     if (written != -1) {
         int n = vd.vbuff.curpos - vrprintf_buf;