id3v2: check index against buffer size. Fix out of array access
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 21:57:39 +0000 (22:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 22:12:42 +0000 (23:12 +0100)
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/id3v2.c

index c6f88ec..f805f5b 100644 (file)
@@ -704,9 +704,9 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
                 uint8_t *b;
 
                 b = buffer;
-                while (avio_tell(s->pb) < end) {
+                while (avio_tell(s->pb) < end && b - buffer < tlen) {
                     *b++ = avio_r8(s->pb);
-                    if (*(b - 1) == 0xff && avio_tell(s->pb) < end - 1) {
+                    if (*(b - 1) == 0xff && avio_tell(s->pb) < end - 1 && b - buffer < tlen) {
                         uint8_t val = avio_r8(s->pb);
                         *b++ = val ? val : avio_r8(s->pb);
                     }