diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-02 22:05:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-15 12:25:46 +0100 |
| commit | 8d483f9849b2293fced7a7b0a7d46226e9eaf4a4 (patch) | |
| tree | 638f604cd65ce11553fb0b2d182a229343ce41a7 | |
| parent | 958cc68d51abb7db894675c6d0a71aa43ced77d6 (diff) | |
| download | ffmpeg-8d483f9849b2293fced7a7b0a7d46226e9eaf4a4.tar.gz | |
avcodec/ptx: Check that the input contains at least one line
Fixes: Timeout (19sec -> 44ms)
Fixes: 17816/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PTX_fuzzer-5704459950227456
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 a6ad328256fe6a6ace7d1e15f3515afccf1247fc)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/ptx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c index 42147f4afc..19f9305cda 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -55,6 +55,9 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, buf += offset; + if (buf_end - buf < w * bytes_per_pixel) + return AVERROR_INVALIDDATA; + if ((ret = ff_set_dimensions(avctx, w, h)) < 0) return ret; |