virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

avcodec/vc1dec: Fix "return -1" cases

Browse Source 
Reviewed-by: "mypopy@gmail.com" <mypopy@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 26f040bcb4)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-12-17 00:04:23 +01:00
parent 9fbd7b65d7
commit 6583f572d1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vc1dec.c
View File

@ -431,7 +431,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
v->output_height = avctx->height;
if (!avctx->extradata_size || !avctx->extradata)
return -1;
return AVERROR_INVALIDDATA;
v->s.avctx = avctx;
if ((ret = ff_vc1_init_common(v)) < 0)
@ -472,7 +472,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
if (avctx->extradata_size < 16) {
av_log(avctx, AV_LOG_ERROR, "Extradata size too small: %i\n", avctx->extradata_size);
return -1;
return AVERROR_INVALIDDATA;
}
buf2 = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
@ -508,7 +508,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
av_free(buf2);
if (!seq_initialized || !ep_initialized) {
av_log(avctx, AV_LOG_ERROR, "Incomplete extradata\n");
return -1;
return AVERROR_INVALIDDATA;
}
v->res_sprite = (avctx->codec_id == AV_CODEC_ID_VC1IMAGE);
}
@ -577,7 +577,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
v->sprite_height > 1 << 14 ||
v->output_width > 1 << 14 ||
v->output_height > 1 << 14) {
ret = -1;
ret = AVERROR_INVALIDDATA;
goto error;
}