diff mbox series

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

Message ID 20201212113844.21201-2-michael@niedermayer.cc
State Superseded
Headers show
Series [FFmpeg-devel,1/2] avformat/wtvdec: Check for EOF before potentially reseting the eof state | expand

Checks

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

Commit Message

Michael Niedermayer Dec. 12, 2020, 11:38 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 Dec. 12, 2020, 11:55 p.m. UTC | #1 
On Sat, Dec 12, 2020 at 12:38:44PM +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(+)

ill send a better patch, no need to review this

[...]
diff mbox series

Patch

diff --git a/libavformat/voc_packet.c b/libavformat/voc_packet.c
index 1e2e19e1c3..3492227deb 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)
+            return AVERROR_INVALIDDATA;
         type = avio_r8(pb);
         if (type == VOC_TYPE_EOF)
             return AVERROR_EOF;