RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/iff: Move index use after check in decodeplane8() 

Fixes: index 9 out of bounds for type 'const uint64_t [8][256]'
Fixes: 18409/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IFF_ILBM_fuzzer-5767030560522240
Fixes: 18720/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IFF_ILBM_fuzzer-5651995784642560

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 2019-10-29 19:12:23 +01:00
parent f09151fff9
commit a1f8b36cc4
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/iff.c
View File

@ -456,11 +456,12 @@ static av_cold int decode_init(AVCodecContext *avctx)
*/ */
static void decodeplane8(uint8_t *dst, const uint8_t *buf, int buf_size, int plane) static void decodeplane8(uint8_t *dst, const uint8_t *buf, int buf_size, int plane)
{ {
const uint64_t *lut = plane8_lut[plane]; const uint64_t *lut;
if (plane >= 8) { if (plane >= 8) {
av_log(NULL, AV_LOG_WARNING, "Ignoring extra planes beyond 8\n"); av_log(NULL, AV_LOG_WARNING, "Ignoring extra planes beyond 8\n");
return; return;
} }
lut = plane8_lut[plane];
do { do {
uint64_t v = AV_RN64A(dst) | lut[*buf++]; uint64_t v = AV_RN64A(dst) | lut[*buf++];
AV_WN64A(dst, v); AV_WN64A(dst, v);