aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-02-17 21:27:16 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2018-02-27 19:59:58 +0100
commit876ecfccfb2796906e1017fbad0388c411052c06 (patch)
tree722fa732afb7702ecc903623b24811369793aa32
parente0750d2067dc71133cf1c16c0884bd605a4578c7 (diff)
downloadffmpeg-876ecfccfb2796906e1017fbad0388c411052c06.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 19c7dbb012..2ac40dd2d1 100644
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -304,11 +304,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;