Commit 470c9bad authored by Jim Jagielski's avatar Jim Jagielski
Browse files

* rotatelogs: Fix possible buffer overflow if admin configures a 

     mongo log file path.
     Trunk already has a fix.
     2.2.x patch: http://people.apache.org/~trawick/rotatelogs.overflow.txt
     +1: trawick, rpluem, lars, jim



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@987780 13f79535-47bb-0310-9956-ffa450edef68
parent aa5d316d

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.17



  *) rotatelogs: Fix possible buffer overflow if admin configures a

     mongo log file path. [Jeff Trawick]



  *) mod_ssl: Do not do overlapping memcpy. PR 45444 [Joe Orton]



  *) vhost: A purely-numeric Host: header should not be treated as a port.

STATUS

+0 −5
Changes for STATUS: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -87,11 +87,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



   * rotatelogs: Fix possible buffer overflow if admin configures a

     mongo log file path.

     Trunk already has a fix.

     2.2.x patch: http://people.apache.org/~trawick/rotatelogs.overflow.txt

     +1: trawick, rpluem, lars, jim



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

support/rotatelogs.c

+1 −1
Changes for support/rotatelogs.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ int main (int argc, const char * const argv[]) 
                apr_strftime(buf2, &rs, sizeof(buf2), szLogRoot, &e);

            }

            else {

                sprintf(buf2, "%s.%010d", szLogRoot, tLogStart);

                apr_snprintf(buf2, sizeof(buf2), "%s.%010d", szLogRoot, tLogStart);

            }

            tLogEnd = tLogStart + tRotation;

            pfile_prev = pfile;