diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-02-17 21:27:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-08 19:45:45 +0200 |
| commit | 1c905c02d059b22bd1ab2e011ec4977d937da916 (patch) | |
| tree | e529047921e5191aa872bec3a1b37591ab7db98d | |
| parent | db617c9520257b2b28f319fed324f9d618dc8433 (diff) | |
| download | ffmpeg-1c905c02d059b22bd1ab2e011ec4977d937da916.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.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index 4a6d6bbbf5..9a31b77ddc 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; |