highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/gdv: Error out if we had insufficent input for the output frame in decompress_2()

Browse Source 
Fixes: Timeout (with the previous commits to gdv.c)
Fixes: 9422/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_GDV_fuzzer-5143490001371136

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
2018-08-05 17:22:23 +02:00
parent 510bd61941
commit 35517e3ca7
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/gdv.c
View File

@@ -230,6 +230,10 @@ static int decompress_2(AVCodecContext *avctx)
break; break;
} }
} }
if (bytestream2_get_bytes_left_p(pb) > 0)
return AVERROR_INVALIDDATA;
return 0; return 0;
} }
@@ -458,6 +462,8 @@ static int gdv_decode_frame(AVCodecContext *avctx, void *data,
default: default:
av_assert0(0); av_assert0(0);
} }
if (ret < 0)
return ret;
memcpy(frame->data[1], gdv->pal, AVPALETTE_SIZE); memcpy(frame->data[1], gdv->pal, AVPALETTE_SIZE);
dst = frame->data[0]; dst = frame->data[0];