Fix potential IndexOutOfRangeException when parsing M3U8

lay295 · Dec 31, 2023 · ee7c269 · ee7c269
1 parent 8d7f23c
commit ee7c269
Showing 1 changed file with 24 additions and 10 deletions.
diff --git a/TwitchDownloaderCore/Tools/M3U8.cs b/TwitchDownloaderCore/Tools/M3U8.cs
@@ -31,15 +31,17 @@ public static M3U8 Parse(System.IO.Stream stream, Encoding streamEncoding, strin
 
             while (sr.ReadLine() is { } line)
             {
+                if (string.IsNullOrWhiteSpace(line))
+                {
+                    ClearStreamMetadata(out currentExtMediaInfo, out currentExtStreamInfo, out currentExtProgramDateTime, out currentByteRange, out currentExtPartInfo);
+                    continue;
+                }
+
                 if (line[0] != '#')
                 {
                     var path = Path.Combine(basePath, line);
                     streams.Add(new Stream(currentExtMediaInfo, currentExtStreamInfo, currentExtPartInfo, currentExtProgramDateTime, currentByteRange, path));
-                    currentExtMediaInfo = null;
-                    currentExtStreamInfo = null;
-                    currentExtProgramDateTime = default;
-                    currentByteRange = default;
-                    currentExtPartInfo = null;
+                    ClearStreamMetadata(out currentExtMediaInfo, out currentExtStreamInfo, out currentExtProgramDateTime, out currentByteRange, out currentExtPartInfo);
 
                     continue;
                 }
@@ -90,15 +92,17 @@ public static M3U8 Parse(ReadOnlySpan<char> text, string basePath = "")
                 if (lineEnd != -1)
                     workingSlice = workingSlice[..lineEnd];
 
+                if (workingSlice.IsWhiteSpace())
+                {
+                    ClearStreamMetadata(out currentExtMediaInfo, out currentExtStreamInfo, out currentExtProgramDateTime, out currentByteRange, out currentExtPartInfo);
+                    continue;
+                }
+
                 if (workingSlice[0] != '#')
                 {
                     var path = Path.Combine(basePath, workingSlice.ToString());
                     streams.Add(new Stream(currentExtMediaInfo, currentExtStreamInfo, currentExtPartInfo, currentExtProgramDateTime, currentByteRange, path));
-                    currentExtMediaInfo = null;
-                    currentExtStreamInfo = null;
-                    currentExtProgramDateTime = default;
-                    currentByteRange = default;
-                    currentExtPartInfo = null;
+                    ClearStreamMetadata(out currentExtMediaInfo, out currentExtStreamInfo, out currentExtProgramDateTime, out currentByteRange, out currentExtPartInfo);
 
                     if (lineEnd == -1)
                         break;
@@ -120,6 +124,16 @@ public static M3U8 Parse(ReadOnlySpan<char> text, string basePath = "")
             return new M3U8(metadataBuilder.ToMetadata(), streams.ToArray());
         }
 
+        private static void ClearStreamMetadata(out Stream.ExtMediaInfo currentExtMediaInfo, out Stream.ExtStreamInfo currentExtStreamInfo, out DateTimeOffset currentExtProgramDateTime,
+            out Stream.ExtByteRange currentByteRange, out Stream.ExtPartInfo currentExtPartInfo)
+        {
+            currentExtMediaInfo = null;
+            currentExtStreamInfo = null;
+            currentExtProgramDateTime = default;
+            currentByteRange = default;
+            currentExtPartInfo = null;
+        }
+
         private static bool ParseM3U8Key(ReadOnlySpan<char> text, Metadata.Builder metadataBuilder, ref Stream.ExtMediaInfo extMediaInfo, ref Stream.ExtStreamInfo extStreamInfo,
             ref DateTimeOffset extProgramDateTime, ref Stream.ExtByteRange byteRange, ref Stream.ExtPartInfo extPartInfo)
         {