[FFmpeg-cvslog] r20238 - trunk/libavformat/id3v2.c

[jai_menon]

Author: jai_menon
Date: Thu Oct 15 15:55:19 2009
New Revision: 20238

Log:
Skip padding bytes correctly in ID3 tags.
This fixes a regression introduced in r20170.

Modified:
   trunk/libavformat/id3v2.c

Modified: trunk/libavformat/id3v2.c
==============================================================================
--- trunk/libavformat/id3v2.c	Thu Oct 15 13:50:32 2009	(r20237)
+++ trunk/libavformat/id3v2.c	Thu Oct 15 15:55:19 2009	(r20238)
@@ -213,7 +213,12 @@ void ff_id3v2_parse(AVFormatContext *s, 
 
         if (tag[0] == 'T')
             read_ttag(s, tlen, tag);
-
+        else if (!tag[0]) {
+            if (tag[1])
+                av_log(s, AV_LOG_WARNING, "invalid frame id, assuming padding");
+            url_fskip(s->pb, len);
+            break;
+        }
         /* Skip to end of tag */
         url_fseek(s->pb, next, SEEK_SET);
     }