mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-06 16:10:09 +02:00
vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
This commit is contained in:
parent
bfe9f48ad7
commit
0aa907cfb1
@ -5579,11 +5579,17 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
|
||||
}
|
||||
if (i) {
|
||||
v->pic_header_flag = 0;
|
||||
if (v->field_mode && i == n_slices1 + 2)
|
||||
ff_vc1_parse_frame_header_adv(v, &s->gb);
|
||||
else if (get_bits1(&s->gb)) {
|
||||
if (v->field_mode && i == n_slices1 + 2) {
|
||||
if (ff_vc1_parse_frame_header_adv(v, &s->gb) < 0) {
|
||||
av_log(v->s.avctx, AV_LOG_ERROR, "Field header damaged\n");
|
||||
continue;
|
||||
}
|
||||
} else if (get_bits1(&s->gb)) {
|
||||
v->pic_header_flag = 1;
|
||||
ff_vc1_parse_frame_header_adv(v, &s->gb);
|
||||
if (ff_vc1_parse_frame_header_adv(v, &s->gb) < 0) {
|
||||
av_log(v->s.avctx, AV_LOG_ERROR, "Slice header damaged\n");
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
s->start_mb_y = (i == 0) ? 0 : FFMAX(0, slices[i-1].mby_start % mb_height);
|
||||
|
Loading…
Reference in New Issue
Block a user