From: Tom Finegan <tomfinegan@google.com>
Date: Mon, 4 Apr 2016 18:49:42 +0000 (-0700)
Subject: Fix crash when mkvparser returns a NULL BlockEntry.
X-Git-Tag: v1.6.0~251^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79d5aac74f472cb5b3213a082fe162fa712aca85;p=libvpx

Fix crash when mkvparser returns a NULL BlockEntry.

BUG=https://bugs.chromium.org/p/webm/issues/detail?id=1090

Change-Id: I64b7b19581f15d53048e3026c3f8946e344fbe26
---

diff --git a/webmdec.cc b/webmdec.cc
index f541cfecc..c4539a0b9 100644
--- a/webmdec.cc
+++ b/webmdec.cc
@@ -164,7 +164,7 @@ int webm_read_frame(struct WebmInputContext *webm_ctx,
       }
       get_new_block = true;
     }
-    if (status) {
+    if (status || block_entry == NULL) {
       return -1;
     }
     if (get_new_block) {