external/libwebp/CVE-2023-1999.patch.1 | 52 ++++++++++++++++++++++++++++
external/libwebp/UnpackedTarball_libwebp.mk | 1
2 files changed, 53 insertions(+)
New commits:
commit 5faee475a9f5225c04f403a8f1dc436a0324a1f4
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Jun 14 10:08:13 2023 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sat Sep 9 23:48:08 2023 +0200
backport CVE-2023-1999 libwebp fix
Change-Id: Idce341a78e44af9940d287d2a08b02d2ee9a6dae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153040
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
(cherry picked from commit 8f020443fda691878ac05c47503169b390f34188)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156730
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/external/libwebp/CVE-2023-1999.patch.1
b/external/libwebp/CVE-2023-1999.patch.1
new file mode 100644
index 000000000000..65c2cf75fb79
--- /dev/null
+++ b/external/libwebp/CVE-2023-1999.patch.1
@@ -0,0 +1,52 @@
+From a486d800b60d0af4cc0836bf7ed8f21e12974129 Mon Sep 17 00:00:00 2001
+From: James Zern <jz...@google.com>
+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
+---
+ 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 <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);
+
diff --git a/external/libwebp/UnpackedTarball_libwebp.mk
b/external/libwebp/UnpackedTarball_libwebp.mk
index 67f797157717..78761793174e 100644
--- a/external/libwebp/UnpackedTarball_libwebp.mk
+++ b/external/libwebp/UnpackedTarball_libwebp.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libwebp,0))
$(eval $(call gb_UnpackedTarball_add_patches,libwebp,\
external/libwebp/Makefile.vc.patch \
+ external/libwebp/CVE-2023-1999.patch.1 \
))
# vim: set noet sw=4 ts=4:
