Check if two consecutive MPEG audio frames are consistent.

This fixes reading the audio properties of some MP3 files reported by a Kodi user.
This is basically the same check as FFmpeg does.

diff --git a/taglib/mpeg/mpegheader.cpp b/taglib/mpeg/mpegheader.cpp
index 53c559faae01389481d89101397aeb17a761441b..1b93560b1dc26aba94d2a0058667a93382258fc0 100644 (file)
--- a/taglib/mpeg/mpegheader.cpp
+++ b/taglib/mpeg/mpegheader.cpp
@@ -307,10 +307,24 @@ void MPEG::Header::parse(File *file, long offset, bool checkLength)
   if(checkLength) {
 
     file->seek(offset + d->frameLength);
-    const ByteVector nextSynch = file->readBlock(2);
+    const ByteVector nextData = file->readBlock(4);
 
-    if(nextSynch.size() < 2 || !firstSyncByte(nextSynch[0]) || !secondSynchByte(nextSynch[1])) {
-      debug("MPEG::Header::parse() -- Calculated frame length did not match the actual length.");
+    if(nextData.size() < 4) {
+      debug("MPEG::Header::parse() -- Could not read the next frame header.");
+      return;
+    }
+
+    // The MPEG versions, layers and sample rates of the two frames should be
+    // consistent. Otherwise, we assume that either or both of the frames are
+    // broken.
+
+    const unsigned int HeaderMask = 0xfffe0c00;
+
+    const unsigned int header     = data.toUInt(0, true)     & HeaderMask;
+    const unsigned int nextHeader = nextData.toUInt(0, true) & HeaderMask;
+
+    if(header != nextHeader) {
+      debug("MPEG::Header::parse() -- The next frame was not consistent with this frame.");
       return;
     }
   }