[FFmpeg-cvslog] avcodec/vp3: Check init_get_bits8() for failure
Michael Niedermayer
git at videolan.org
Thu Nov 12 04:07:37 CET 2015
ffmpeg | branch: release/2.7 | Michael Niedermayer <michael at niedermayer.cc> | Fri Sep 4 01:13:05 2015 +0200| [dceec28eac8a8a8190c98d8ba73ed3e6989cf762] | committer: Michael Niedermayer
avcodec/vp3: Check init_get_bits8() for failure
Fixes CID1322316
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit cbd3cd8eb2de2280d83da5ee875c35581b46a3a3)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dceec28eac8a8a8190c98d8ba73ed3e6989cf762
---
libavcodec/vp3.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 005f043..2c8a8fe 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);
More information about the ffmpeg-cvslog
mailing list