aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-09-04 01:13:05 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-11-12 02:55:46 +0100
commitdceec28eac8a8a8190c98d8ba73ed3e6989cf762 (patch)
treec9933b514cbb97000aaef429de2c6fa826988ac3
parent95db0aa276feca1e818c59f9905927a5932e881c (diff)
downloadffmpeg-dceec28eac8a8a8190c98d8ba73ed3e6989cf762.tar.gz
avcodec/vp3: Check init_get_bits8() for failure
Fixes CID1322316 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit cbd3cd8eb2de2280d83da5ee875c35581b46a3a3) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/vp3.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 005f043b0f..2c8a8fec91 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2473,6 +2473,7 @@ static av_cold int theora_decode_init(AVCodecContext *avctx)
const uint8_t *header_start[3];
int header_len[3];
int i;
+ int ret;
avctx->pix_fmt = AV_PIX_FMT_YUV420P;
@@ -2492,7 +2493,9 @@ static av_cold int theora_decode_init(AVCodecContext *avctx)
for (i = 0; i < 3; i++) {
if (header_len[i] <= 0)
continue;
- init_get_bits8(&gb, header_start[i], header_len[i]);
+ ret = init_get_bits8(&gb, header_start[i], header_len[i]);
+ if (ret < 0)
+ return ret;
ptype = get_bits(&gb, 8);