From a44a45573f5846dd63653375a1b2370e6bf8d0ed Mon Sep 17 00:00:00 2001 From: "a." Date: Tue, 14 Jul 2026 16:25:31 +0200 Subject: [PATCH] Fix PointConverter's leading white-space handling --- .../src/System/Drawing/PointConverter.cs | 4 ++-- .../tests/Drawing/PointConverterTests.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.ComponentModel.TypeConverter/src/System/Drawing/PointConverter.cs b/src/libraries/System.ComponentModel.TypeConverter/src/System/Drawing/PointConverter.cs index bf69e52414a17e..410e237c945a3d 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/src/System/Drawing/PointConverter.cs +++ b/src/libraries/System.ComponentModel.TypeConverter/src/System/Drawing/PointConverter.cs @@ -44,8 +44,8 @@ public override bool CanConvertTo(ITypeDescriptorContext? context, [NotNullWhen( } TypeConverter converter = TypeDescriptor.GetConverterTrimUnsafe(typeof(int)); - int x = (int)converter.ConvertFromString(context, culture, strValue[ranges[0]])!; - int y = (int)converter.ConvertFromString(context, culture, strValue[ranges[1]])!; + int x = (int)converter.ConvertFromString(context, culture, text[ranges[0]].ToString())!; + int y = (int)converter.ConvertFromString(context, culture, text[ranges[1]].ToString())!; return new Point(x, y); } diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/Drawing/PointConverterTests.cs b/src/libraries/System.ComponentModel.TypeConverter/tests/Drawing/PointConverterTests.cs index b0a8d19167e8f2..04851079280bc6 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/tests/Drawing/PointConverterTests.cs +++ b/src/libraries/System.ComponentModel.TypeConverter/tests/Drawing/PointConverterTests.cs @@ -235,7 +235,7 @@ public void ConvertFromInvariantString_FormatException() public void ConvertFromString(int x, int y) { var point = - (Point)Converter.ConvertFromString(string.Format("{0}{2} {1}", x, y, + (Point)Converter.ConvertFromString(string.Format(" {0}{2} {1}", x, y, CultureInfo.CurrentCulture.TextInfo.ListSeparator)); Assert.Equal(x, point.X); Assert.Equal(y, point.Y);