summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2015-09-24 19:50:42 -0700
committerJames Zern <jzern@google.com>2015-09-24 19:51:14 -0700
commit921c347ef6b67f8ed2f02080d3941cce51d4acbb (patch)
treee245a3be7bcbc03ac6b5285cc1a700a6f1ec667a
parentee72b6915e777b34b431cc600ea8d75b81e24cab (diff)
downloadlibvpx-921c347ef6b67f8ed2f02080d3941cce51d4acbb.tar
libvpx-921c347ef6b67f8ed2f02080d3941cce51d4acbb.tar.gz
libvpx-921c347ef6b67f8ed2f02080d3941cce51d4acbb.tar.bz2
libvpx-921c347ef6b67f8ed2f02080d3941cce51d4acbb.zip
vp9/10 decoder_remove: check pbi pointer
fixes crash on error Change-Id: Ibb1ef5565fb833cdee1a49335473d98f1187ef43
-rw-r--r--vp10/decoder/decoder.c3
-rw-r--r--vp9/decoder/vp9_decoder.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/vp10/decoder/decoder.c b/vp10/decoder/decoder.c
index 81bd35787..23851afa7 100644
--- a/vp10/decoder/decoder.c
+++ b/vp10/decoder/decoder.c
@@ -126,6 +126,9 @@ VP10Decoder *vp10_decoder_create(BufferPool *const pool) {
void vp10_decoder_remove(VP10Decoder *pbi) {
int i;
+ if (!pbi)
+ return;
+
vpx_get_worker_interface()->end(&pbi->lf_worker);
vpx_free(pbi->lf_worker.data1);
vpx_free(pbi->tile_data);
diff --git a/vp9/decoder/vp9_decoder.c b/vp9/decoder/vp9_decoder.c
index 61077cdbe..4e88819b1 100644
--- a/vp9/decoder/vp9_decoder.c
+++ b/vp9/decoder/vp9_decoder.c
@@ -126,6 +126,9 @@ VP9Decoder *vp9_decoder_create(BufferPool *const pool) {
void vp9_decoder_remove(VP9Decoder *pbi) {
int i;
+ if (!pbi)
+ return;
+
vpx_get_worker_interface()->end(&pbi->lf_worker);
vpx_free(pbi->lf_worker.data1);
vpx_free(pbi->tile_data);