summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-06-18 12:26:08 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-09-05 17:48:59 +0200
commit8dff6da31305ba2f9ebf04e75ad86e1972271760 (patch)
tree50ded7255806ebdd9c08690dd5fcb30709148387 /libavcodec
parent8821023b156496a27395e9c46b8b969512d1de63 (diff)
avcodec/tdsc: Only reallocate deflatebuffer if its size changed
Fixes: Timeout (47sec -> 35msec) Fixes: 23375/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TDSC_fuzzer-5633949497032704 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')
-rw-r--r--libavcodec/tdsc.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/libavcodec/tdsc.c b/libavcodec/tdsc.c
index 3617911071..dfd80f6dbc 100644
--- a/libavcodec/tdsc.c
+++ b/libavcodec/tdsc.c
@@ -529,10 +529,15 @@ static int tdsc_decode_frame(AVCodecContext *avctx, void *data,
/* Resize deflate buffer on resolution change */
if (ctx->width != avctx->width || ctx->height != avctx->height) {
- ctx->deflatelen = avctx->width * avctx->height * (3 + 1);
- ret = av_reallocp(&ctx->deflatebuffer, ctx->deflatelen);
- if (ret < 0)
- return ret;
+ int deflatelen = avctx->width * avctx->height * (3 + 1);
+ if (deflatelen != ctx->deflatelen) {
+ ctx->deflatelen =deflatelen;
+ ret = av_reallocp(&ctx->deflatebuffer, ctx->deflatelen);
+ if (ret < 0) {
+ ctx->deflatelen = 0;
+ return ret;
+ }
+ }
}
dlen = ctx->deflatelen;