diff mbox

[FFmpeg-devel,2/4] avformat/vividas: Check that value from ffio_read_varlen() does not overflow

Message ID 20190720220856.17516-2-michael@niedermayer.cc
State Accepted
Commit 07357cd93355d553dde698933a8176dd48b98344
Headers show

Commit Message

Michael Niedermayer July 20, 2019, 10:08 p.m. UTC 
Fixes: signed integer overflow: -1241665686 + -1340629419 cannot be represented in type 'int'
Fixes: 15922/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5692826442006528

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

Comments

Michael Niedermayer Aug. 3, 2019, 3:18 p.m. UTC | #1 
On Sun, Jul 21, 2019 at 12:08:54AM +0200, Michael Niedermayer wrote:
> Fixes: signed integer overflow: -1241665686 + -1340629419 cannot be represented in type 'int'
> Fixes: 15922/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5692826442006528
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/vividas.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)

will apply

[...]
diff mbox

Patch

diff --git a/libavformat/vividas.c b/libavformat/vividas.c
index 1895c75858..c3d3cf548c 100644
--- a/libavformat/vividas.c
+++ b/libavformat/vividas.c
@@ -374,8 +374,11 @@  static int track_header(VividasDemuxContext *viv, AVFormatContext *s,  uint8_t *
             ffio_read_varlen(pb); // len_3
             num_data = avio_r8(pb);
             for (j = 0; j < num_data; j++) {
-                data_len[j] = ffio_read_varlen(pb);
-                xd_size += data_len[j];
+                uint64_t len = ffio_read_varlen(pb);
+                if (len > INT_MAX/2 - xd_size)
+                    return AVERROR_INVALIDDATA;
+                data_len[j] = len;
+                xd_size += len;
             }
 
             st->codecpar->extradata_size = 64 + xd_size + xd_size / 255;