OSDN Git Service

tta: datalen is unsigned integer per reference library
authorPaul B Mahol <onemda@gmail.com>
Wed, 17 Oct 2012 09:12:18 +0000 (09:12 +0000)
committerPaul B Mahol <onemda@gmail.com>
Wed, 17 Oct 2012 11:58:08 +0000 (11:58 +0000)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavformat/tta.c

index 1440c80..445389e 100644 (file)
@@ -44,8 +44,9 @@ static int tta_read_header(AVFormatContext *s)
 {
     TTAContext *c = s->priv_data;
     AVStream *st;
-    int i, channels, bps, samplerate, datalen;
+    int i, channels, bps, samplerate;
     uint64_t framepos, start_offset;
+    uint32_t datalen;
 
     if (!av_dict_get(s->metadata, "", NULL, AV_DICT_IGNORE_SUFFIX))
         ff_id3v1_read(s);
@@ -64,9 +65,9 @@ static int tta_read_header(AVFormatContext *s)
     }
 
     datalen = avio_rl32(s->pb);
-    if(datalen < 0){
-        av_log(s, AV_LOG_ERROR, "nonsense datalen\n");
-        return -1;
+    if (!datalen) {
+        av_log(s, AV_LOG_ERROR, "invalid datalen\n");
+        return AVERROR_INVALIDDATA;
     }
 
     avio_skip(s->pb, 4); // header crc