diff options
| author | Danilo G. Baio <dbaio@FreeBSD.org> | 2018-02-23 20:35:13 +0000 |
|---|---|---|
| committer | Danilo G. Baio <dbaio@FreeBSD.org> | 2018-02-23 20:35:13 +0000 |
| commit | 663d5c44471383cd3a2c98acaea8b7e40254f536 (patch) | |
| tree | e172e82c32bc05d461249b11c81e7cc858284e92 /www/squid/files/patch-src_esi_CustomParser.cc | |
| parent | New port: math/reduce-psl (diff) | |
www/squid: Fixes security vulnerabilities
Add patches to fix CVE's:
CVE-2018-1000024
CVE-2018-1000027
PR: 226139
Submitted by: Yasuhiro KIMURA <yasu@utahime.org>
Approved by: timp87@gmail.com (maintainer)
MFH: 2018Q1
Security: d5b6d151-1887-11e8-94f7-9c5c8e75236a
Notes
Notes:
svn path=/head/; revision=462744
Diffstat (limited to 'www/squid/files/patch-src_esi_CustomParser.cc')
| -rw-r--r-- | www/squid/files/patch-src_esi_CustomParser.cc | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/www/squid/files/patch-src_esi_CustomParser.cc b/www/squid/files/patch-src_esi_CustomParser.cc new file mode 100644 index 000000000000..8c9287c64ecd --- /dev/null +++ b/www/squid/files/patch-src_esi_CustomParser.cc @@ -0,0 +1,28 @@ +http://www.squid-cache.org/Versions/v3/3.5/changesets/SQUID-2018_1.patch + +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) + +--- src/esi/CustomParser.cc.orig 2018-02-23 13:37:52 UTC ++++ src/esi/CustomParser.cc +@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t + + 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 + + char * endofName = strpbrk(const_cast<char *>(tag), w_space); + +- if (endofName > tagEnd) ++ if (!endofName || endofName > tagEnd) + endofName = const_cast<char *>(tagEnd); + + *endofName = '\0'; |