From d6ea59b8608ddd214b61866bd86e965f62514a0c Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Wed, 17 Oct 2012 09:12:18 +0000 Subject: [PATCH] tta: datalen is unsigned integer per reference library Signed-off-by: Paul B Mahol --- libavformat/tta.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavformat/tta.c b/libavformat/tta.c index 1440c8000a..445389ed95 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -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 -- 2.11.0