MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/tscc: Move reget buffer to after decoding

Browse Source 
reget buffer can be time consuming, theres no need to do it if failures
occur

Testcase: 9010/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TSCC_fuzzer-6042614817095680

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-07-15 13:52:50 +02:00
parent 706c9beaea
commit 91578f5798
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/tscc.c
View File

@ -70,9 +70,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVFrame *frame = c->frame;
int ret;
if ((ret = ff_reget_buffer(avctx, frame)) < 0)
return ret;
ret = inflateReset(&c->zstream);
if (ret != Z_OK) {
av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", ret);
@ -89,6 +86,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return AVERROR_UNKNOWN;
}
if ((ret = ff_reget_buffer(avctx, frame)) < 0)
return ret;
if (ret != Z_DATA_ERROR) {
bytestream2_init(&c->gb, c->decomp_buf,