From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Fri, 19 Jan 2018 00:54:14 +0000 (+1300)
Subject: ESI: make sure endofName never exceeds tagEnd (#130)
X-Git-Tag: SQUID_3_5_28~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb2db98a676321b814fc4a51c4fb7928a8bb45d9;p=thirdparty%2Fsquid.git

ESI: make sure endofName never exceeds tagEnd (#130)
---

diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc
index d86d2d309b..db634d9219 100644
--- a/src/esi/CustomParser.cc
+++ b/src/esi/CustomParser.cc
@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
 
             char * endofName = strpbrk(const_cast<char *>(tag), w_space);
 
-            if (endofName > tagEnd)
+            if (!endofName || endofName > tagEnd)
                 endofName = const_cast<char *>(tagEnd);
 
             *endofName = '\0';
@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool
 
             char * endofName = strpbrk(const_cast<char *>(tag), w_space);
 
-            if (endofName > tagEnd)
+            if (!endofName || endofName > tagEnd)
                 endofName = const_cast<char *>(tagEnd);
 
             *endofName = '\0';