[release/7.0] Fix parsing the output of ping on Samsung phones (#80502)

github-actions[bot] · simonrozsival · web-flow · commit cb2d02e97f24 · 2023-01-12T13:43:37.000-08:00
* Account for different formats of ping output

* Avoid allocation

Co-authored-by: Simon Rozsival &lt;simon@rozsival.com&gt;
diff --git a/src/libraries/System.Net.Ping/src/System/Net/NetworkInformation/Ping.PingUtility.cs b/src/libraries/System.Net.Ping/src/System/Net/NetworkInformation/Ping.PingUtility.cs
@@ -131,9 +131,11 @@ private static bool TryParseTtlExceeded(string stdout, out PingReply? reply)
                 return false;
             }
 
-            // look for address in "From 172.21.64.1 icmp_seq=1 Time to live exceeded"
+            // look for address in:
+            // - "From 172.21.64.1 icmp_seq=1 Time to live exceeded"
+            // - "From 172.21.64.1: icmp_seq=1 Time to live exceeded"
             int addressStart = stdout.IndexOf("From ", StringComparison.Ordinal) + 5;
-            int addressLength = stdout.IndexOf(' ', Math.Max(addressStart, 0)) - addressStart;
+            int addressLength = stdout.AsSpan(Math.Max(addressStart, 0)).IndexOfAny(' ', ':');
             IPAddress? address;
             if (addressStart < 5 || addressLength <= 0 || !IPAddress.TryParse(stdout.AsSpan(addressStart, addressLength), out address))
             {

Original file line number	Diff line number	Diff line change
`@@ -131,9 +131,11 @@ private static bool TryParseTtlExceeded(string stdout, out PingReply? reply)`
`131`	`131`	`return false;`
`132`	`132`	`}`
`133`	`133`
`134`		`- // look for address in "From 172.21.64.1 icmp_seq=1 Time to live exceeded"`
	`134`	`+ // look for address in:`
	`135`	`+ // - "From 172.21.64.1 icmp_seq=1 Time to live exceeded"`
	`136`	`+ // - "From 172.21.64.1: icmp_seq=1 Time to live exceeded"`
`135`	`137`	`int addressStart = stdout.IndexOf("From ", StringComparison.Ordinal) + 5;`
`136`		`- int addressLength = stdout.IndexOf(' ', Math.Max(addressStart, 0)) - addressStart;`
	`138`	`+ int addressLength = stdout.AsSpan(Math.Max(addressStart, 0)).IndexOfAny(' ', ':');`
`137`	`139`	`IPAddress? address;`
`138`	`140`	`if (addressStart < 5 \|\| addressLength <= 0 \|\| !IPAddress.TryParse(stdout.AsSpan(addressStart, addressLength), out address))`
`139`	`141`	`{`