diff options
| author | Tom Finegan <tomfinegan@google.com> | 2016-04-04 11:49:42 -0700 |
|---|---|---|
| committer | Tom Finegan <tomfinegan@google.com> | 2016-04-04 11:50:44 -0700 |
| commit | 79d5aac74f472cb5b3213a082fe162fa712aca85 (patch) | |
| tree | e14b515c0b456d47a0cfec61fb5a7e095306247b /webmdec.cc | |
| parent | 71cf9fac836c8be197f33be12250a432a2613b48 (diff) | |
| download | libvpx-79d5aac74f472cb5b3213a082fe162fa712aca85.tar libvpx-79d5aac74f472cb5b3213a082fe162fa712aca85.tar.gz libvpx-79d5aac74f472cb5b3213a082fe162fa712aca85.tar.bz2 libvpx-79d5aac74f472cb5b3213a082fe162fa712aca85.zip | |
Fix crash when mkvparser returns a NULL BlockEntry.
BUG=https://bugs.chromium.org/p/webm/issues/detail?id=1090
Change-Id: I64b7b19581f15d53048e3026c3f8946e344fbe26
Diffstat (limited to 'webmdec.cc')
| -rw-r--r-- | webmdec.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |