har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "avcodec/er: remove check for fields"

Browse Source 
Fixes: out of array write on x86-32
Fixes: 57825/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG2VIDEO_fuzzer-6094366187061248
Fixes: 57829/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG2VIDEO_fuzzer-4526419991724032

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
This reverts commit f7abe92bd7939b6aeeb2393fe141033e733305d4.
This commit is contained in:
Michael Niedermayer 2023-04-09 15:31:32 +02:00
parent 5366ae12b9
commit fa618f5f49
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/error_resilience.c
View File

@ -805,7 +805,8 @@ void ff_er_frame_start(ERContext *s)
static int er_supported(ERContext *s)
{
if(s->avctx->hwaccel && s->avctx->hwaccel->decode_slice ||
!s->cur_pic.f
!s->cur_pic.f ||
s->cur_pic.field_picture
)
return 0;
return 1;
@ -907,12 +908,6 @@ void ff_er_frame_end(ERContext *s)
(s->avctx->skip_top + s->avctx->skip_bottom)) {
return;
}
if (!s->warned_fields && (s->cur_pic.field_picture || s->cur_pic.f->interlaced_frame)) {
av_log(s->avctx, AV_LOG_WARNING, "Error concealment is not fully implemented for field pictures.\n");
s->warned_fields = 1;
}
linesize = s->cur_pic.f->linesize;
if ( s->avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO

1
libavcodec/error_resilience.h
View File

@ -87,7 +87,6 @@ typedef struct ERContext {
int (*mv)[2][4][2],
int mb_x, int mb_y, int mb_intra, int mb_skipped);
void *opaque;
int warned_fields;
} ERContext;
void ff_er_frame_start(ERContext *s);