From 1cf18de982a0a62fa9214a6c4a5becc1a32d9caf Mon Sep 17 00:00:00 2001 From: Tomas Härdin Date: Tue, 17 May 2011 19:52:36 +0200 Subject: wav: make sure neither data_size nor sample_count is negative. Signed-off-by: Anton Khirnov --- libavformat/wav.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/wav.c b/libavformat/wav.c index 3e4e0c4ea4..9f902be818 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -318,6 +318,12 @@ static int wav_read_header(AVFormatContext *s, avio_rl64(pb); /* RIFF size */ data_size = avio_rl64(pb); sample_count = avio_rl64(pb); + if (data_size < 0 || sample_count < 0) { + av_log(s, AV_LOG_ERROR, "negative data_size and/or sample_count in " + "ds64: data_size = %"PRId64", sample_count = %"PRId64"\n", + data_size, sample_count); + return AVERROR_INVALIDDATA; + } avio_skip(pb, size - 16); /* skip rest of ds64 chunk */ } -- cgit v1.2.3