diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-18 23:17:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-29 19:22:19 +0200 |
| commit | 7c30ff38880570377168096417f714b21102b343 (patch) | |
| tree | b604c62c7ddca3b8144f1cf55025153efb760aca | |
| parent | fb4a4557d15bce601e2462207648741600fa273f (diff) | |
| download | ffmpeg-7c30ff38880570377168096417f714b21102b343.tar.gz | |
avformat/vqf: Check header_size
Fixes: 15271/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5735262606327808
Fixes: signed integer overflow: -2147483648 - 8 cannot be represented in type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/vqf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/vqf.c b/libavformat/vqf.c index a58992318a..755849bac7 100644 --- a/libavformat/vqf.c +++ b/libavformat/vqf.c @@ -107,6 +107,9 @@ static int vqf_read_header(AVFormatContext *s) header_size = avio_rb32(s->pb); + if (header_size < 0) + return AVERROR_INVALIDDATA; + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_TWINVQ; st->start_time = 0; @@ -120,7 +123,7 @@ static int vqf_read_header(AVFormatContext *s) len = avio_rb32(s->pb); - if ((unsigned) len > INT_MAX/2) { + if ((unsigned) len > INT_MAX/2 || header_size < 8) { av_log(s, AV_LOG_ERROR, "Malformed header\n"); return -1; } |