From 476aceaa22a0f68d69fe8477f9ee98bf212d222c Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 15 Dec 2013 20:12:48 +0100
Subject: [PATCH] vformat/id3v2: check avio_read for short reads in addition to
errors
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavformat/id3v2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index 5f5ccb6322..c2bd56ff46 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -667,7 +667,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version,
unsigned long dlen;
if (isv34) {
- if (avio_read(s->pb, tag, 4) < 0)
+ if (avio_read(s->pb, tag, 4) < 4)
break;
tag[4] = 0;
if (version == 3) {
@@ -677,7 +677,7 @@ static void id3v2_parse(AVFormatContext *s, int len, uint8_t version,
tflags = avio_rb16(s->pb);
tunsync = tflags & ID3v2_FLAG_UNSYNCH;
} else {
- if (avio_read(s->pb, tag, 3) < 0)
+ if (avio_read(s->pb, tag, 3) < 3)
break;
tag[3] = 0;
tlen = avio_rb24(s->pb);