diff options
Diffstat (limited to 'main/squid/SQUID-2018_1.patch')
-rw-r--r-- | main/squid/SQUID-2018_1.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/main/squid/SQUID-2018_1.patch b/main/squid/SQUID-2018_1.patch deleted file mode 100644 index 9392219a9e..0000000000 --- a/main/squid/SQUID-2018_1.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit eb2db98a676321b814fc4a51c4fb7928a8bb45d9 (refs/remotes/origin/v3.5) -Author: Amos Jeffries <yadij@users.noreply.github.com> -Date: 2018-01-19 13:54:14 +1300 - - ESI: make sure endofName never exceeds tagEnd (#130) - -diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc -index d86d2d3..db634d9 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'; |