ref: 99211b0263968c102a9c81b2d051f1ceadfad93a
parent: 5ab46e0ecdccd4ff9cc876a7f9a5887eceddd054
parent: 79d5aac74f472cb5b3213a082fe162fa712aca85
author: Tom Finegan <tomfinegan@google.com>
date: Wed Apr 6 11:03:09 EDT 2016
Merge "Fix crash when mkvparser returns a NULL BlockEntry."
--- a/webmdec.cc
+++ b/webmdec.cc
@@ -164,7 +164,7 @@
}
get_new_block = true;
}
- if (status) {+ if (status || block_entry == NULL) {return -1;
}
if (get_new_block) {--
⑨