diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-15 14:04:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-23 02:58:38 +0200 |
| commit | d2015e6b86d717fbedb313481145355130bd3567 (patch) | |
| tree | c7c3cfa4715e592e168fae35e1d319da50714f0a /libavcodec/tscc.c | |
| parent | 679bfa453f60e61178cc93cb85d2b272ccd23fea (diff) | |
avcodec/tscc: Do not duplicate images
This improves speed
Fixes: Timeout
Fixes: 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>
Diffstat (limited to 'libavcodec/tscc.c')
| -rw-r--r-- | libavcodec/tscc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index fc9510451b..31e7caeeeb 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -94,6 +94,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, c->zstream.avail_out = c->decomp_size; ret = inflate(&c->zstream, Z_FINISH); // Z_DATA_ERROR means empty picture + if (ret == Z_DATA_ERROR && !palette_has_changed) { + return buf_size; + } + if ((ret != Z_OK) && (ret != Z_STREAM_END) && (ret != Z_DATA_ERROR)) { av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", ret); return AVERROR_UNKNOWN; |