diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-06-27 16:12:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-06-28 21:35:01 +0200 |
| commit | 75a2db552423295b509546f3b0f8b2b46d3424b1 (patch) | |
| tree | f602116fb30250549ae2e02a6dbb2a4e1cf7560b | |
| parent | 46fb150a81abed256dbe779809bcbe57f1ba9434 (diff) | |
| download | ffmpeg-75a2db552423295b509546f3b0f8b2b46d3424b1.tar.gz | |
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/ffmpeg
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/dpx.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index f75e2cbbca..cf23bb6ba1 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -395,12 +395,14 @@ static int decode_frame(AVCodecContext *avctx, if (elements == 4) *dst[3]++ = read16(&buf, endian) >> shift & 0xFFF; } else { - *dst[2]++ = read12in32(&buf, &rgbBuffer, - &n_datum, endian); + if (elements >= 3) + *dst[2]++ = read12in32(&buf, &rgbBuffer, + &n_datum, endian); *dst[0]++ = read12in32(&buf, &rgbBuffer, &n_datum, endian); - *dst[1]++ = read12in32(&buf, &rgbBuffer, - &n_datum, endian); + if (elements >= 2) + *dst[1]++ = read12in32(&buf, &rgbBuffer, + &n_datum, endian); if (elements == 4) *dst[3]++ = read12in32(&buf, &rgbBuffer, &n_datum, endian); |