--- a/server/util.c  2017/05/30 12:27:41 1796855

+++ b/server/util.c  2017/05/30 12:28:20 1796856

@@ -1679,10 +1679,8 @@

     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) {