mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-19 21:06:42 +00:00
avcodec/vc1dec: Fix "return -1" cases
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:
parent
f6179e23cf
commit
27846766d8
@ -427,7 +427,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)
|
||||
@ -468,7 +468,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);
|
||||
@ -504,7 +504,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);
|
||||
}
|
||||
@ -573,7 +573,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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user