Make sure neither data_size nor sample_count is negative
authorTomas Härdin <tomas.hardin@codemill.se>
Tue, 17 May 2011 17:52:36 +0000 (19:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 May 2011 20:19:58 +0000 (22:19 +0200)
libavformat/wav.c

index 1832bc9..6b1e574 100644 (file)
@@ -238,6 +238,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 = %li, sample_count = %li\n",
+                   data_size, sample_count);
+            return AVERROR_INVALIDDATA;
+        }
         avio_skip(pb, size - 16); /* skip rest of ds64 chunk */
     }