Fixed possible infinite read loop in mpeg parsing

Walkyst · Dec 15, 2022 · b94abef · b94abef
1 parent ea43154
commit b94abef
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/main/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegReader.java b/main/src/main/java/com/sedmelluq/discord/lavaplayer/container/mpeg/reader/MpegReader.java
@@ -57,7 +57,13 @@ public MpegSectionInfo nextChild(MpegSectionInfo parent) throws IOException {
     }
 
     long length = Integer.toUnsignedLong(lengthField);
-    return new MpegSectionInfo(offset, length, readFourCC());
+    String type = readFourCC();
+
+    if (length == 1) {
+      length = data.readLong();
+    }
+
+    return new MpegSectionInfo(offset, length, type);
   }
 
   /**
@@ -79,7 +85,7 @@ public void skip(MpegSectionInfo section) {
    */
   public String readFourCC() throws IOException {
     data.readFully(fourCcBuffer);
-    return new String(fourCcBuffer, "ISO-8859-1");
+    return new String(fourCcBuffer, StandardCharsets.ISO_8859_1);
   }
 
   /**