diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-28 00:23:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-05 23:48:52 +0100 |
| commit | 2b9e849c37124ce571c8697a10b6b6124c4c2840 (patch) | |
| tree | 7f2cee70a92957155ef06822314b116d05d41f3c | |
| parent | d8c0546ecdb0514cbc44a4ec656563710dd8b25a (diff) | |
| download | ffmpeg-2b9e849c37124ce571c8697a10b6b6124c4c2840.tar.gz | |
avcodec/vp3: Clear context on reinitialization failure
Fixes null pointer dereference
Fixes: 1536b9b096a8f95b742bae9d3d761cc6/signal_sigsegv_294aaed_2039_8d1797aeb823ea43858d0fa45c9eb899.ogv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 6105b7219a90438deae71b0dc5a034c71ee30fc0)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/vp3.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 8aca83ae09..7df406ca2e 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2010,17 +2010,19 @@ static int vp3_decode_frame(AVCodecContext *avctx, vp3_decode_end(avctx); ret = theora_decode_header(avctx, &gb); + if (ret >= 0) + ret = vp3_decode_init(avctx); if (ret < 0) { vp3_decode_end(avctx); - } else - ret = vp3_decode_init(avctx); + } return ret; } else if (type == 2) { ret = theora_decode_tables(avctx, &gb); + if (ret >= 0) + ret = vp3_decode_init(avctx); if (ret < 0) { vp3_decode_end(avctx); - } else - ret = vp3_decode_init(avctx); + } return ret; } |