diff mbox series

[FFmpeg-devel,1/5] avformat/voc_packet: Add a basic check on max_size

Message ID 20201213003031.14698-1-michael@niedermayer.cc
State Accepted
Commit 52f75181bfada2b4b127e744674591c7753c4b7d
Headers show
Series [FFmpeg-devel,1/5] avformat/voc_packet: Add a basic check on max_size | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished

Commit Message

Michael Niedermayer Dec. 13, 2020, 12:30 a.m. UTC 
Fixes: signed integer overflow: -2147483648 - 4 cannot be represented in type 'int'
Fixes: 28127/clusterfuzz-testcase-minimized-ffmpeg_dem_VOC_fuzzer-4880586455646208

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

Comments

Michael Niedermayer March 1, 2021, 7:16 p.m. UTC | #1 
On Sun, Dec 13, 2020 at 01:30:27AM +0100, Michael Niedermayer wrote:
> Fixes: signed integer overflow: -2147483648 - 4 cannot be represented in type 'int'
> Fixes: 28127/clusterfuzz-testcase-minimized-ffmpeg_dem_VOC_fuzzer-4880586455646208
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/voc_packet.c | 2 ++
>  1 file changed, 2 insertions(+)

will apply

[...]
diff mbox series

Patch

diff --git a/libavformat/voc_packet.c b/libavformat/voc_packet.c
index 1e2e19e1c3..9d7d2025cd 100644
--- a/libavformat/voc_packet.c
+++ b/libavformat/voc_packet.c
@@ -44,6 +44,8 @@  ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
                        AVINDEX_KEYFRAME);
 
     while (!voc->remaining_size) {
+        if (max_size < 4)
+            max_size = 0;
         type = avio_r8(pb);
         if (type == VOC_TYPE_EOF)
             return AVERROR_EOF;