Merge pull request #22724 from ramezgerges/text_trimming_enumeration_crash

agneszitte · web-flow · commit 66171b4417f2 · 2026-02-24T18:57:04.000-05:00
diff --git a/src/Uno.UI/UI/Xaml/Documents/UnicodeText.skia.cs b/src/Uno.UI/UI/Xaml/Documents/UnicodeText.skia.cs
@@ -519,7 +519,7 @@ internal unsafe UnicodeText(
 					while (trimPoint.Value is { containsOnlyWhitespace: true, containsTab: false } && trimPoint.Value.start > line.start)
 					{
 						trimPoint = trimPoint.Previous!;
-						if (enumerator.Current == trimPoint)
+						if (hasMore && enumerator.Current == trimPoint)
 						{
 							hasMore = enumerator.MoveNext();
 						}

Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,7 @@ internal unsafe UnicodeText(`
`519`	`519`	`while (trimPoint.Value is { containsOnlyWhitespace: true, containsTab: false } && trimPoint.Value.start > line.start)`
`520`	`520`	`{`
`521`	`521`	`trimPoint = trimPoint.Previous!;`
`522`		`- if (enumerator.Current == trimPoint)`
	`522`	`+ if (hasMore && enumerator.Current == trimPoint)`
`523`	`523`	`{`
`524`	`524`	`hasMore = enumerator.MoveNext();`
`525`	`525`	`}`