Commit 2af4a380 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1748653 from trunk: 

Fix a potential buffer overflow.
Submitted by: jailletc36
Reviewed/backported by: jim


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

STATUS

+0 −4
Original line number Diff line number Diff line
@@ -114,10 +114,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

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



  *) mod_sed: Fix a potential buffer overflow.

     trunk patch: http://svn.apache.org/r1748653

     2.4.x: trunk patch works

     +1: jailletc36, rpluem, jim

modules/filters/sed0.c

+2 −2
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ jtcommon: 
                    command_errf(commands, SEDERR_SMMES, commands->linebuf);

                    return -1;

                }

                if (text(commands, fnamebuf, &fnamebuf[APR_PATH_MAX]) == NULL) {

                if (text(commands, fnamebuf, &fnamebuf[APR_PATH_MAX-1]) == NULL) {

                    command_errf(commands, SEDERR_FNTL, commands->linebuf);

                    return -1;

                }
@@ -617,7 +617,7 @@ jtcommon: 
                command_errf(commands, SEDERR_SMMES, commands->linebuf);

                return -1;

            }

            if (text(commands, fnamebuf, &fnamebuf[APR_PATH_MAX]) == NULL) {

            if (text(commands, fnamebuf, &fnamebuf[APR_PATH_MAX-1]) == NULL) {

                command_errf(commands, SEDERR_FNTL, commands->linebuf);

                return -1;

            }