summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2023-12-26 10:49:35 +0100
committerConrad Kostecki <conikost@gentoo.org>2023-12-28 02:03:09 +0100
commit51973b04b9a24774b003f92a31953d2d26790a21 (patch)
treeaf2545b762c0c1485e810a75355d69c08575e697 /media-libs/libwebp
parentapp-crypt/xca: remove unused patch (diff)
downloadgentoo-51973b04b9a24774b003f92a31953d2d26790a21.tar.gz
gentoo-51973b04b9a24774b003f92a31953d2d26790a21.tar.bz2
gentoo-51973b04b9a24774b003f92a31953d2d26790a21.zip
media-libs/libwebp: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/34487 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'media-libs/libwebp')
-rw-r--r--media-libs/libwebp/files/libwebp-1.2.4-CVE-2023-1999.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/media-libs/libwebp/files/libwebp-1.2.4-CVE-2023-1999.patch b/media-libs/libwebp/files/libwebp-1.2.4-CVE-2023-1999.patch
deleted file mode 100644
index 9c023712a5aa..000000000000
--- a/media-libs/libwebp/files/libwebp-1.2.4-CVE-2023-1999.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit a486d800b60d0af4cc0836bf7ed8f21e12974129
-Author: James Zern <jzern@google.com>
-Date: Wed Feb 22 22:15:47 2023 -0800
-
- EncodeAlphaInternal: clear result->bw on error
-
- This avoids a double free should the function fail prior to
- VP8BitWriterInit() and a previous trial result's buffer carried over.
- Previously in ApplyFiltersAndEncode() trial.bw (with a previous
- iteration's buffer) would be freed, followed by best.bw pointing to the
- same buffer.
-
- Since:
- 187d379d add a fallback to ALPHA_NO_COMPRESSION
-
- In addition, check the return value of VP8BitWriterInit() in this
- function.
-
- Bug: webp:603
- Change-Id: Ic258381ee26c8c16bc211d157c8153831c8c6910
-
-diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c
-index f7c02690..7d205586 100644
---- a/src/enc/alpha_enc.c
-+++ b/src/enc/alpha_enc.c
-@@ -13,6 +13,7 @@
-
- #include <assert.h>
- #include <stdlib.h>
-+#include <string.h>
-
- #include "src/enc/vp8i_enc.h"
- #include "src/dsp/dsp.h"
-@@ -148,6 +149,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height,
- }
- } else {
- VP8LBitWriterWipeOut(&tmp_bw);
-+ memset(&result->bw, 0, sizeof(result->bw));
- return 0;
- }
- }
-@@ -162,7 +164,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height,
- header = method | (filter << 2);
- if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4;
-
-- VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size);
-+ if (!VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size)) ok = 0;
- ok = ok && VP8BitWriterAppend(&result->bw, &header, ALPHA_HEADER_LEN);
- ok = ok && VP8BitWriterAppend(&result->bw, output, output_size);
-