Commit 841e1399 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/dpx: Check elements in 12bps planar path

Fixes: null pointer dereference
Fixes: 8946/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DPX_fuzzer-5078915222601728

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegReviewed-by: 's avatarCarl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 75a2db55)
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 9f76f0fa
...@@ -408,12 +408,14 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -408,12 +408,14 @@ static int decode_frame(AVCodecContext *avctx,
if (elements == 4) if (elements == 4)
*dst[3]++ = read16(&buf, endian) >> 4; *dst[3]++ = read16(&buf, endian) >> 4;
} else { } else {
*dst[2]++ = read12in32(&buf, &rgbBuffer, if (elements >= 3)
&n_datum, endian); *dst[2]++ = read12in32(&buf, &rgbBuffer,
&n_datum, endian);
*dst[0]++ = read12in32(&buf, &rgbBuffer, *dst[0]++ = read12in32(&buf, &rgbBuffer,
&n_datum, endian); &n_datum, endian);
*dst[1]++ = read12in32(&buf, &rgbBuffer, if (elements >= 2)
&n_datum, endian); *dst[1]++ = read12in32(&buf, &rgbBuffer,
&n_datum, endian);
if (elements == 4) if (elements == 4)
*dst[3]++ = read12in32(&buf, &rgbBuffer, *dst[3]++ = read12in32(&buf, &rgbBuffer,
&n_datum, endian); &n_datum, endian);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment