cc938acea4
Updated gtk/babl to 0.1.106 Updated gtk/cairo to 1.17.6 Updated gtk/gdk-pixbuf to 2.42.10 Updated gtk/gegl to 0.4.44 Updated gtk/glib-networking to 2.76.0 Updated gtk/gnome-desktop to 44.0 Updated gtk/gobject-introspection to 1.76.1 Updated gtk/gsettings-desktop-schemas to 44.0 Updated gtk/gtk3 to 3.24.38 Updated gtk/harfbuzz to 7.3.0 Updated gtk/libgsf to 1.14.50 Updated gtk/libnotify to 0.8.2 Updated gtk/librsvg to 2.56.1 Updated gtk/libwebp to 1.3.0 Updated gtk/pango to 1.50.14 Updated gtk/pinentry to 1.2.1 Updated gtk/shared-mime-info to 2.2 Updated gtk build list
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From a486d800b60d0af4cc0836bf7ed8f21e12974129 Mon Sep 17 00:00:00 2001
|
|
From: James Zern <jzern@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);
|
|
|