Commit a585e36e authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1796350 from trunk: 

short-circuit on NULL

Submitted By: jchampion


Submitted by: covener
Reviewed by: covener, ylavic, jim


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

STATUS

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

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



  *) core: Terminate token processing on NULL.

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

     2.4.x patch: svn merge -c 1796350 ^/httpd/httpd/trunk .

     +1: covener, ylavic, jim





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

server/util.c

+2 −4
Original line number Diff line number Diff line
@@ -1679,10 +1679,8 @@ AP_DECLARE(int) ap_find_token(apr_pool_t *p, const char *line, const char *tok) 


    s = (const unsigned char *)line;

    for (;;) {

        /* find start of token, skip all stop characters, note NUL

         * isn't a token stop, so we don't need to test for it

         */

        while (TEST_CHAR(*s, T_HTTP_TOKEN_STOP)) {

        /* find start of token, skip all stop characters */

        while (*s && TEST_CHAR(*s, T_HTTP_TOKEN_STOP)) {

            ++s;

        }

        if (!*s) {