From 921c347ef6b67f8ed2f02080d3941cce51d4acbb Mon Sep 17 00:00:00 2001 From: James Zern Date: Thu, 24 Sep 2015 19:50:42 -0700 Subject: [PATCH] vp9/10 decoder_remove: check pbi pointer fixes crash on error Change-Id: Ibb1ef5565fb833cdee1a49335473d98f1187ef43 --- vp10/decoder/decoder.c | 3 +++ vp9/decoder/vp9_decoder.c | 3 +++ 2 files changed, 6 insertions(+) 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); -- 2.40.0