aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-02-17 21:27:16 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2018-04-13 00:35:15 +0200
commitaf5c12c0290b6269d178dcded041f2201a8532b4 (patch)
treecccbf8d9e14acf5287a60d4fc6278414ffd93e5a
parent93a16aebf2ac0b29956bd831417e4dbc2477dacf (diff)
downloadffmpeg-af5c12c0290b6269d178dcded041f2201a8532b4.tar.gz
avcodec/dxtory: Remove code that corrupts dimensions
Fixes: Timeout Fixes: 5796/clusterfuzz-testcase-minimized-5206729085157376 Does someone have a valid sample that triggers this path ? Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3748746a4d6988484d34516f7a3c6febf7bdf488) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/dxtory.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index e736cec8db..285ca38efb 100644
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -305,11 +305,7 @@ static int dxtory_decode_v2(AVCodecContext *avctx, AVFrame *pic,
}
if (avctx->height - line) {
- av_log(avctx, AV_LOG_VERBOSE,
- "Not enough slice data available, "
- "cropping the frame by %d pixels\n",
- avctx->height - line);
- avctx->height = line;
+ avpriv_request_sample(avctx, "Not enough slice data available");
}
return 0;