Merge "Fix crash when mkvparser returns a NULL BlockEntry."

2016-04-06 15:03:09 +00:00 · 2016-04-06 15:03:09 +00:00 · 99211b0263
commit 99211b0263
parent 5ab46e0ecd 79d5aac74f
1 changed files with 1 additions and 1 deletions
--- 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) {