[FFmpeg-cvslog] asv1: Verify the amount of extradata
Martin Storsjö
git at videolan.org
Thu Jan 16 22:08:50 CET 2014
ffmpeg | branch: release/0.10 | Martin Storsjö <martin at martin.st> | Thu Sep 19 15:14:56 2013 +0300| [036136fa89ac44fd89c7f4730d3039f0b3b92cfd] | committer: Luca Barbato
asv1: Verify the amount of extradata
The init function reads one byte of extradata.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit f50803354c6acb4575379d7c54ca48ec5d36dd61)
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=036136fa89ac44fd89c7f4730d3039f0b3b92cfd
---
libavcodec/asv1.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index 8db23c0..cdddfa5 100644
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@@ -535,6 +535,11 @@ static av_cold int decode_init(AVCodecContext *avctx){
int i;
const int scale= avctx->codec_id == CODEC_ID_ASV1 ? 1 : 2;
+ if (avctx->extradata_size < 1) {
+ av_log(avctx, AV_LOG_ERROR, "No extradata provided\n");
+ return AVERROR_INVALIDDATA;
+ }
+
common_init(avctx);
init_vlcs(a);
ff_init_scantable(a->dsp.idct_permutation, &a->scantable, scantab);
More information about the ffmpeg-cvslog
mailing list