Merge commit 'f50803354c6acb4575379d7c54ca48ec5d36dd61'
* commit 'f50803354c6acb4575379d7c54ca48ec5d36dd61': asvdec: Verify the amount of extradata See: 605f2b6b004eee4dc57832257169ff8eaa562fb7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
1e9a850df9
@ -271,6 +271,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
|
||||
const int scale = avctx->codec_id == AV_CODEC_ID_ASV1 ? 1 : 2;
|
||||
int i;
|
||||
|
||||
if (avctx->extradata_size < 1) {
|
||||
av_log(avctx, AV_LOG_ERROR, "No extradata provided\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
ff_asv_common_init(avctx);
|
||||
init_vlcs(a);
|
||||
ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_asv_scantab);
|
||||
|
Loading…
x
Reference in New Issue
Block a user