Ticket #2814: fix3.patch

mythplugins/mythmusic/mythmusic/metaioid3v2.cpp

@@ -307 +307 @@
     
     while (loop_de_doo) 
     {
+        const unsigned char *prev_buf = 0;
+
         if (buflen < sizeof(buffer)) 
         {
             int bytes;
@@ -322 +324 @@
         {
             if (mad_header_decode(&header, &stream) == -1)
             {
+                // If we fail on the same buffer, we're not going to make
+                // any progress.
+                if (prev_buf == stream.buffer) 
+                {
+                    loop_de_doo = false;
+                    break;
+                }
+                prev_buf = stream.buffer;
+
                 if (!MAD_RECOVERABLE(stream.error))
                 {
                     break;
@@ -335 +346 @@
                     {
                         mad_stream_skip(&stream, tagsize);
                         s.st_size -= tagsize;
+                        prev_buf = 0;
                     }
                 }
             }
             else
             {
+                prev_buf = 0;
                 if(amount_checked == 0)
                 {
                     old_bitrate = header.bitrate;