aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Härdin <tomas.hardin@codemill.se>2011-05-17 19:52:36 +0200
committerAnton Khirnov <anton@khirnov.net>2011-07-13 11:57:51 +0200
commit1cf18de982a0a62fa9214a6c4a5becc1a32d9caf (patch)
tree8ef22188976a9dcdf0a7902ce69188471bd8458f
parent7f84055e2d3814972a61515da7f1d2659b185ea0 (diff)
downloadffmpeg-1cf18de982a0a62fa9214a6c4a5becc1a32d9caf.tar.gz
wav: make sure neither data_size nor sample_count is negative.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--libavformat/wav.c6
1 files changed, 6 insertions, 0 deletions
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 */
}