8283190: Improve MIDI processing

Reviewed-by: prr, rhalade, psadhukhan, mschoene
openjdk · Jul 19, 2022 · a37465b · a37465b
1 parent 632d2d2
commit a37465b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java
@@ -367,6 +367,11 @@ void readTrack(Track track) throws IOException, InvalidMidiDataException {
                     case 0xF7:
                         // sys ex
                         int sysexLength = (int) readVarInt();
+                        if (sysexLength < 0 || sysexLength > trackLength - pos) {
+                            throw new InvalidMidiDataException("Message length is out of bounds: "
+                                    + sysexLength);
+                        }
+
                         byte[] sysexData = new byte[sysexLength];
                         read(sysexData);
 
@@ -379,8 +384,8 @@ void readTrack(Track track) throws IOException, InvalidMidiDataException {
                         // meta
                         int metaType = readUnsigned();
                         int metaLength = (int) readVarInt();
-                        if (metaLength < 0) {
-                            throw new InvalidMidiDataException("length out of bounds: "
+                        if (metaLength < 0 || metaLength > trackLength - pos) {
+                            throw new InvalidMidiDataException("Message length is out of bounds: "
                                     + metaLength);
                         }
                         final byte[] metaData;