diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-28 00:23:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-12-06 12:40:50 +0100 |
| commit | af3e5bdd0d3277bc555cc8026c169d46e1d08ef2 (patch) | |
| tree | 17c5d5f2268b31d81022967c36ab92aa07cb362c | |
| parent | 02764f12a67129ec89c3de5a0b7b2edf1236bee2 (diff) | |
| download | ffmpeg-af3e5bdd0d3277bc555cc8026c169d46e1d08ef2.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 4a72d0dbbd..c9bc859d8a 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; } |