Index: mythplugins/mythmusic/mythmusic/metaioid3v2.cpp
===================================================================
--- mythplugins/mythmusic/mythmusic/metaioid3v2.cpp	(revision 12388)
+++ mythplugins/mythmusic/mythmusic/metaioid3v2.cpp	(working copy)
@@ -364,7 +364,13 @@
             break;
 
         memmove(buffer, stream.next_frame, &buffer[buflen] - stream.next_frame);
-        buflen -= stream.next_frame - &buffer[0];
+        if (stream.next_frame - &buffer[0] == 0) {
+            break;
+        }
+        else 
+        {
+            buflen -= stream.next_frame - &buffer[0];
+        }
     }
 
     mad_header_finish(&header);