Fix #171071: crash when importing incorrect MIDI file

musescore · Feb 13, 2017 · 548344b · 548344b
1 parent 1d72a05
commit 548344b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/midi/midifile.cpp b/midi/midifile.cpp
@@ -218,6 +218,9 @@ bool MidiFile::read(QIODevice* in)
       if (memcmp(tmp, "MThd", 4) || len < 6)
             throw(QString("bad midifile: MThd expected"));
 
+      if (len > 6)
+            throw(QString("unsupported MIDI header data size: %1 instead of 6").arg(len));
+
       _format     = readShort();
       int ntracks = readShort();
 
@@ -254,9 +257,6 @@ bool MidiFile::read(QIODevice* in)
 
       // =====================================================
 
-      if (len > 6)
-            skip(len-6); // skip the excess
-
       switch (_format) {
             case 0:
                   if (readTrack())