summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSkal <skal@google.com>2019-12-13 14:21:09 +0100
committerPascal Massimino <skal@google.com>2019-12-13 13:26:16 +0000
commit295e5e38013cee910761116c13490d9d9500842c (patch)
tree6989e2b8750ea16dced2c239371fe600f4e848fa
parente2575e05cb35dd5364b945d0c7f5770fd322a84e (diff)
downloadlibwebp-295e5e38013cee910761116c13490d9d9500842c.tar.gz
fix UBSAN warning
"applying non-zero offset 2044 to null pointer" Fixes chromium bug #19447 Change-Id: I530ae27dc64e92ed0018f36469264c448329e042
-rw-r--r--src/dec/frame_dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dec/frame_dec.c b/src/dec/frame_dec.c
index bda9e1a6..04609a8e 100644
--- a/src/dec/frame_dec.c
+++ b/src/dec/frame_dec.c
@@ -732,7 +732,7 @@ static int AllocateMemory(VP8Decoder* const dec) {
mem += f_info_size;
dec->thread_ctx_.id_ = 0;
dec->thread_ctx_.f_info_ = dec->f_info_;
- if (dec->mt_method_ > 0) {
+ if (dec->filter_type_ > 0 && dec->mt_method_ > 0) {
// secondary cache line. The deblocking process need to make use of the
// filtering strength from previous macroblock row, while the new ones
// are being decoded in parallel. We'll just swap the pointers.