diff --git a/backport-CVE-2023-1999.patch b/backport-CVE-2023-1999.patch deleted file mode 100644 index e868ac60fce83a10e61513c790784d56ec89aa5c..0000000000000000000000000000000000000000 --- a/backport-CVE-2023-1999.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a486d800b60d0af4cc0836bf7ed8f21e12974129 Mon Sep 17 00:00:00 2001 -From: James Zern -Date: Wed, 22 Feb 2023 22:15:47 -0800 -Subject: [PATCH] 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 - -Reference:https://github.com/webmproject/libwebp/commit/a486d800b60d0af4cc0836bf7ed8f21e12974129 -Conflict:NA ---- - src/enc/alpha_enc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c -index f7c02690e3..7d205586fe 100644 ---- a/src/enc/alpha_enc.c -+++ b/src/enc/alpha_enc.c -@@ -13,6 +13,7 @@ - - #include - #include -+#include - - #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); - diff --git a/libwebp-1.3.0.tar.gz b/libwebp-1.3.1.tar.gz similarity index 66% rename from libwebp-1.3.0.tar.gz rename to libwebp-1.3.1.tar.gz index de31f23edc806462e5e267b7c8ebe2e576d99812..5ee0fdf6bb2a53eb06f0399f216579d396d146eb 100644 Binary files a/libwebp-1.3.0.tar.gz and b/libwebp-1.3.1.tar.gz differ diff --git a/libwebp.spec b/libwebp.spec index d100b440cf0deec1e598d6f2926f186d6a4efd1b..ae68075c033a89d82851b67d958b728c4d8a4476 100644 --- a/libwebp.spec +++ b/libwebp.spec @@ -1,13 +1,12 @@ Name: libwebp -Version: 1.3.0 -Release: 2 +Version: 1.3.1 +Release: 1 URL: http://www.linuxfromscratch.org/blfs/view/svn/general/libwebp.html Summary: Library and tools for the WebP graphics format License: BSD Source0: http://downloads.webmproject.org/releases/webp/%{name}-%{version}.tar.gz Patch6000: libwebp-freeglut.patch -Patch6001: backport-CVE-2023-1999.patch BuildRequires: libjpeg-devel libpng-devel giflib-devel libtiff-devel BuildRequires: java-devel jpackage-utils swig freeglut-devel @@ -113,6 +112,9 @@ cp swig/*.jar swig/*.so %{buildroot}/%{_libdir}/%{name}-java/ %{_mandir}/man*/* %changelog +* Fri Jul 21 2023 zhangpan - 1.3.1-1 +- update to 1.3.1 + * Fri May 26 2023 zhangpan - 1.3.0-2 - fix CVE-2023-1999