[FFmpeg-cvslog] wavdec: check size before reading the data, not after.

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Oct 16 10:37:29 2012 +0200| [a43283b6f4cfbf821d12a94270df8a2199599cc9] | committer: Anton Khirnov

wavdec: check size before reading the data, not after.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a43283b6f4cfbf821d12a94270df8a2199599cc9
---

 libavformat/wavdec.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 9e48531..c9f7abb 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -204,7 +204,7 @@ static int wav_read_header(AVFormatContext *s)
     int64_t size, av_uninit(data_size);
     int64_t sample_count=0;
     int rf64;
-    uint32_t tag, list_type;
+    uint32_t tag;
     AVIOContext *pb = s->pb;
     AVStream *st = NULL;
     WAVDemuxContext *wav = s->priv_data;
@@ -287,12 +287,11 @@ static int wav_read_header(AVFormatContext *s)
                 return ret;
             break;
         case MKTAG('L', 'I', 'S', 'T'):
-            list_type = avio_rl32(pb);
             if (size < 4) {
                 av_log(s, AV_LOG_ERROR, "too short LIST");
                 return AVERROR_INVALIDDATA;
             }
-            switch (list_type) {
+            switch (avio_rl32(pb)) {
             case MKTAG('I', 'N', 'F', 'O'):
                 if ((ret = ff_read_riff_info(s, size - 4)) < 0)
                     return ret;