avcodec/tscc: Move reget buffer to after decoding
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 15 Jul 2018 11:52:50 +0000 (13:52 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 18 Jul 2018 11:59:25 +0000 (13:59 +0200)
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>
libavcodec/tscc.c

index cb86b58..f891932 100644 (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,