virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

avcodec/mjpegbdec: Check for AVDISCARD_ALL

Browse Source 
Fixes: Assertion failure
Fixes: 51825/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MJPEGB_fuzzer-6393802688692224

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2022-11-12 20:29:14 +01:00
parent 9498bc7c32
commit 64c6c56890
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mjpegbdec.c
View File

@ -141,9 +141,10 @@ read_header:
av_log(avctx, AV_LOG_WARNING, "no picture\n"); av_log(avctx, AV_LOG_WARNING, "no picture\n");
return buf_size; return buf_size;
} }
av_frame_move_ref(rframe, s->picture_ptr); av_frame_move_ref(rframe, s->picture_ptr);
s->got_picture = 0; s->got_picture = 0;
if (avctx->skip_frame == AVDISCARD_ALL)
return AVERROR(EAGAIN);
*got_frame = 1; *got_frame = 1;
if (!s->lossless && avctx->debug & FF_DEBUG_QP) { if (!s->lossless && avctx->debug & FF_DEBUG_QP) {