diff mbox series

[FFmpeg-devel,2/4] avcodec/txd: Check for input size against the header size.

Message ID 20200218235919.9360-2-michael@niedermayer.cc
State Accepted
Commit aeb4e435847e0c970bcb1a835fe5eda17a4e1ce3
Headers show
Series [FFmpeg-devel,1/4] avcodec/qdm2: Check fft_coefs_index | expand

Checks

Context Check Description
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Michael Niedermayer Feb. 18, 2020, 11:59 p.m. UTC 
Fixes: Timeout (21sec -> 80ms)
Fixes: 20673/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TXD_fuzzer-5177453863763968

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/txd.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Michael Niedermayer April 29, 2020, 9:33 p.m. UTC | #1 
On Wed, Feb 19, 2020 at 12:59:17AM +0100, Michael Niedermayer wrote:
> Fixes: Timeout (21sec -> 80ms)
> Fixes: 20673/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TXD_fuzzer-5177453863763968
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/txd.c | 3 +++
>  1 file changed, 3 insertions(+)

will apply

[...]
diff mbox series

Patch

diff --git a/libavcodec/txd.c b/libavcodec/txd.c
index 8b20475d39..f00ba89e82 100644
--- a/libavcodec/txd.c
+++ b/libavcodec/txd.c
@@ -43,6 +43,9 @@  static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     int i, j;
     int ret;
 
+    if (avpkt->size < 88)
+        return AVERROR_INVALIDDATA;
+
     ff_texturedsp_init(&dxtc);
 
     bytestream2_init(&gb, avpkt->data, avpkt->size);