diff mbox

[FFmpeg-devel] avcodec/dxv: Check remaining space in CHECKPOINT()

Message ID 20190320232654.27943-1-michael@niedermayer.cc
State Accepted
Commit 4daec0c6777a6fd545d9e8dcaf9cb6a2cd083235
Headers show

Commit Message

Michael Niedermayer March 20, 2019, 11:26 p.m. UTC 
Fixes: Timeout (77sec -> 1sec)
Fixes: 13407/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXV_fuzzer-5093143018471424

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

Comments

Michael Niedermayer March 28, 2019, 9:20 p.m. UTC | #1 
On Thu, Mar 21, 2019 at 12:26:54AM +0100, Michael Niedermayer wrote:
> Fixes: Timeout (77sec -> 1sec)
> Fixes: 13407/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DXV_fuzzer-5093143018471424
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/dxv.c | 2 ++
>  1 file changed, 2 insertions(+)

will apply

[...]
diff mbox

Patch

diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c
index aef5ec19dd..6fe5516505 100644
--- a/libavcodec/dxv.c
+++ b/libavcodec/dxv.c
@@ -256,6 +256,8 @@  static int decompress_texture_thread(AVCodecContext *avctx, void *arg,
 #define CHECKPOINT(x)                                                         \
     do {                                                                      \
         if (state == 0) {                                                     \
+            if (bytestream2_get_bytes_left(gbc) < 4)                          \
+                return AVERROR_INVALIDDATA;                                   \
             value = bytestream2_get_le32(gbc);                                \
             state = 16;                                                       \
         }                                                                     \