eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-11 17:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/dxtory: Remove code that corrupts dimensions

Browse Source 
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 3748746a4d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2018-02-17 21:27:16 +01:00
parent 93a16aebf2
commit af5c12c029
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dxtory.c
View File

@@ -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;