From 295e5e38013cee910761116c13490d9d9500842c Mon Sep 17 00:00:00 2001
From: Skal <skal@google.com>
Date: Fri, 13 Dec 2019 14:21:09 +0100
Subject: [PATCH] fix UBSAN warning

  "applying non-zero offset 2044 to null pointer"

  Fixes chromium bug #19447

Change-Id: I530ae27dc64e92ed0018f36469264c448329e042
---
 src/dec/frame_dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.