gentoo resync : 06.05.2018

2 files changed, 0 insertions, 42 deletions

diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index ec4e386de802..e555a08b1f19 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,4 +1,3 @@
-AUX libmspack-0.5_alpha-CVE-2017-6419.patch 1483 BLAKE2B ffe990fcdc0783fa3988564b50f734127e6e90be7c76b31ffb2f53a5749cd038193fd650eed0d08da99f58b696adca3d1a7f872c254f425468533430aa575c2d SHA512 b6aafe82630d3bb1254fcce9a8bc528b0f375a2e7eec5f729e04c2d9816feb23ba12a0275efcf5ced6578789c4ef83b4364104b4cc35c2c146f4fb527c8dbf4a
 AUX libmspack-0.6_alpha-fix-tests.patch 575 BLAKE2B 35a8342f103926bfff555237cbd432fd679ab61620aeaf654041cfb6c39a18f3be475bf7e0a93c004d7c953d6f2ed66e4528d3b546e9d22b28e1e666c6d9caeb SHA512 8c715e174d3eca76fb33c2a5eccccd4f7c4c7702320d0db9db5dec6038129f508afade126ae791191ffaaf60740a722db7a87fc76f8c00c86912a1e2e2323eda
 DIST libmspack-0.6alpha.tar.gz 476992 BLAKE2B 3ff510e108e12741b661a4960f204ce268572f79917d4ec18e105d09cee3f515d76e02a2432717ad6c2118c7eb191b51902ce86e3c5b441ee269740816b2a392 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d
 EBUILD libmspack-0.6_alpha.ebuild 1157 BLAKE2B 98ebc782e3bb2320c075809dbac5211e6445cb49f4b1eb1b96e5f1a9397c03a4a023f13e7b8abf2189e338c3f7bba92c6be8e88d1de5aef68b92af29483816ce SHA512 9b74b108818c374164ed133656e34ebbb8225a5180704989f3a7a25e04a69538401f732b3388fa3a319b34258997888d7f116f90d713b67b6be0423d7232d4b3
diff --git a/dev-libs/libmspack/files/libmspack-0.5_alpha-CVE-2017-6419.patch b/dev-libs/libmspack/files/libmspack-0.5_alpha-CVE-2017-6419.patch
deleted file mode 100644
index 1b81fdcbfcd4..000000000000
--- a/dev-libs/libmspack/files/libmspack-0.5_alpha-CVE-2017-6419.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a83773682e856ad6529ba6db8d1792e6d515d7f1 Mon Sep 17 00:00:00 2001
-From: Mickey Sola <msola@sourcefire.com>
-Date: Wed, 29 Mar 2017 14:55:26 -0400
-Subject: [PATCH] fixing potential OOB window write when unpacking chm files
-
----
- libclamav/libmspack-0.5alpha/mspack/lzxd.c | 11 +++++++++--
- libclamav/libmspack.c                      |  6 +++++-
- 2 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/libclamav/libmspack-0.5alpha/mspack/lzxd.c b/libclamav/libmspack-0.5alpha/mspack/lzxd.c
-index 2281e7b9d..45105a583 100644
---- a/mspack/lzxd.c
-+++ b/mspack/lzxd.c
-@@ -766,8 +766,13 @@ int lzxd_decompress(struct lzxd_stream *lzx, off_t out_bytes) {
-       case LZX_BLOCKTYPE_UNCOMPRESSED:
- 	/* as this_run is limited not to wrap a frame, this also means it
- 	 * won't wrap the window (as the window is a multiple of 32k) */
-+        if (window_posn + this_run > lzx->window_size) {
-+                D(("match ran over window boundary"))
-+                return lzx->error = MSPACK_ERR_DECRUNCH;
-+        }
- 	rundest = &window[window_posn];
- 	window_posn += this_run;
-+
- 	while (this_run > 0) {
- 	  if ((i = i_end - i_ptr) == 0) {
- 	    READ_IF_NEEDED;
-@@ -888,8 +893,10 @@ void lzxd_free(struct lzxd_stream *lzx) {
-   struct mspack_system *sys;
-   if (lzx) {
-     sys = lzx->sys;
--    sys->free(lzx->inbuf);
--    sys->free(lzx->window);
-+    if(lzx->inbuf)
-+        sys->free(lzx->inbuf);
-+    if(lzx->window)
-+        sys->free(lzx->window);
-     sys->free(lzx);
-   }
- }