Skip to content
Snippets Groups Projects
Commit 608bed85 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

avcodec/mxpegdec: Check for AVDISCARD_ALL

Fixes: Fixes NULL pointer dereference
Fixes: 36610/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MXPEG_fuzzer-6052641783283712
Fixes: 37907/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MXPEG_fuzzer-4725170850365440
Fixes: 37904/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MXPEG_fuzzer-6367889262247936
Fixes: 38085/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MXPEG_fuzzer-5175270823297024

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg


Signed-off-by: default avatarMichael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 20afd3a6)
Signed-off-by: default avatarMichael Niedermayer <michael@niedermayer.cc>
parent aee47eb6
No related branches found
No related tags found
No related merge requests found
......@@ -195,6 +195,9 @@ static int mxpeg_decode_frame(AVCodecContext *avctx,
int start_code;
int ret;
if (avctx->skip_frame == AVDISCARD_ALL)
return AVERROR_PATCHWELCOME;
buf_ptr = buf;
buf_end = buf + buf_size;
jpg->got_picture = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment