IndexOf(…, count, …) enforces length

iterate-ch · Aug 26, 2024 · fcb621b · fcb621b
1 parent 01fed7e
commit fcb621b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/IKVM.MSBuild.Tasks/IkvmToolTaskDiagnosticWriter.cs b/src/IKVM.MSBuild.Tasks/IkvmToolTaskDiagnosticWriter.cs
@@ -58,9 +58,10 @@ string Message
             // Skip these:
             // - StdErr is mapped to Information
             // - StdOut is mapped to Debug.
-            if (@event.Message.Length > 0 && @event.Message[0] is char first
+            if (@event.Message.Length is { } messageLength and > 0
+                && @event.Message[0] is char first
                 && !char.IsWhiteSpace(first)
-                && @event.Message.IndexOf(": ", 0, 18) is { } firstColon and not -1)
+                && @event.Message.IndexOf(": ", 0, Math.Min(messageLength, 18)) is { } firstColon and not -1)
             {
                 structuredLog.Message = @event.Message.Substring(firstColon + 2);