diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 13:44:40 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 13:45:21 +0200 |
commit | cbabebcc2e3b884296fedf8591e04f59240b3939 (patch) | |
tree | 54f637fbb59548753ac613ec3e4f56aae97a5e6e /pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch | |
parent | 7a22083e1271869294a074cbe7a971f2d8abb4f4 (diff) | |
parent | 93147d737d24f55d8da7257e24d840c9f9b1fe6c (diff) | |
download | nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.gz nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.bz2 nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.lz nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.xz nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.zst nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.zip |
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
Diffstat (limited to 'pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch')
-rw-r--r-- | pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch b/pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch new file mode 100644 index 000000000000..a9787c4a9088 --- /dev/null +++ b/pkgs/tools/archivers/p7zip/13-CVE-2017-17969.patch @@ -0,0 +1,35 @@ +From: =?utf-8?q?Antoine_Beaupr=C3=A9?= <anarcat@debian.org> +Date: Fri, 2 Feb 2018 11:11:41 +0100 +Subject: Heap-based buffer overflow in 7zip/Compress/ShrinkDecoder.cpp + +Origin: vendor, https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/27d7/attachment/CVE-2017-17969.patch +Forwarded: https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/#27d7 +Bug: https://sourceforge.net/p/p7zip/bugs/204/ +Bug-Debian: https://bugs.debian.org/888297 +Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-17969 +Reviewed-by: Salvatore Bonaccorso <carnil@debian.org> +Last-Update: 2018-02-01 +Applied-Upstream: 18.00-beta +--- + CPP/7zip/Compress/ShrinkDecoder.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp +index 80b7e67..ca37764 100644 +--- a/CPP/7zip/Compress/ShrinkDecoder.cpp ++++ b/CPP/7zip/Compress/ShrinkDecoder.cpp +@@ -121,8 +121,13 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * + { + _stack[i++] = _suffixes[cur]; + cur = _parents[cur]; ++ if (cur >= kNumItems || i >= kNumItems) ++ break; + } +- ++ ++ if (cur >= kNumItems || i >= kNumItems) ++ break; ++ + _stack[i++] = (Byte)cur; + lastChar2 = (Byte)cur; + |