diff --git a/taglib/mpeg/mpegheader.cpp b/taglib/mpeg/mpegheader.cpp
index d87c38df..91944c2c 100644
--- a/taglib/mpeg/mpegheader.cpp
+++ b/taglib/mpeg/mpegheader.cpp
@@ -336,6 +336,11 @@ void MPEG::Header::parse(File *file, offset_t offset, bool checkLength)
     // consistent. Otherwise, we assume that either or both of the frames are
     // broken.
 
+    // A frame length of 0 is probably invalid and would pass the test below
+    // because nextData would be the same as data.
+    if(d->frameLength == 0)
+      return;
+
     file->seek(offset + d->frameLength);
     const ByteVector nextData = file->readBlock(4);