Fix RangeAttribute to catch OverflowException instead of throwing (#121029)

Copilot · web-flow · commit 8a293ea44184 · 2025-10-24T08:52:07.000-07:00
Fix RangeAttribute to handle OverflowException
diff --git a/src/libraries/Microsoft.Extensions.Options/gen/Emitter.cs b/src/libraries/Microsoft.Extensions.Options/gen/Emitter.cs
@@ -431,7 +431,7 @@ public void EmitRangeAttribute(string modifier, string prefix, string className,
                             {
                                 convertedValue = ConvertValue(value, formatProvider);
                             }
-                            catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)
+                            catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)
                             {
                                 return false;
                             }
@@ -443,7 +443,7 @@ public void EmitRangeAttribute(string modifier, string prefix, string className,
                         {
                             convertedValue = ConvertValue(value, formatProvider);
                         }
-                        catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)
+                        catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)
                         {
                             return false;
                         }
diff --git a/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/EmitterWithCustomValidator.netcore.g.cs b/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/EmitterWithCustomValidator.netcore.g.cs
@@ -153,7 +153,7 @@ public override bool IsValid(object? value)
             {
                 convertedValue = ConvertValue(value, formatProvider);
             }
-            catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)
+            catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)
             {
                 return false;
             }
diff --git a/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/EmitterWithCustomValidator.netfx.g.cs b/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/EmitterWithCustomValidator.netfx.g.cs
@@ -149,7 +149,7 @@ public override bool IsValid(object? value)
             {
                 convertedValue = ConvertValue(value, formatProvider);
             }
-            catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)
+            catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)
             {
                 return false;
             }
diff --git a/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/GeneratedAttributesTest.netcore.lang10.g.cs b/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/GeneratedAttributesTest.netcore.lang10.g.cs
@@ -513,7 +513,7 @@ public override bool IsValid(object? value)
                 {
                     convertedValue = ConvertValue(value, formatProvider);
                 }
-                catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)
+                catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)
                 {
                     return false;
                 }
diff --git a/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/GeneratedAttributesTest.netcore.lang11.g.cs b/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/GeneratedAttributesTest.netcore.lang11.g.cs
@@ -513,7 +513,7 @@ public override bool IsValid(object? value)
                 {
                     convertedValue = ConvertValue(value, formatProvider);
                 }
-                catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)
+                catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)
                 {
                     return false;
                 }
diff --git a/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/GeneratedAttributesTest.netfx.lang10.g.cs b/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/GeneratedAttributesTest.netfx.lang10.g.cs
@@ -426,7 +426,7 @@ public override bool IsValid(object? value)
                 {
                     convertedValue = ConvertValue(value, formatProvider);
                 }
-                catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)
+                catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)
                 {
                     return false;
                 }
diff --git a/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/GeneratedAttributesTest.netfx.lang11.g.cs b/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/GeneratedAttributesTest.netfx.lang11.g.cs
@@ -426,7 +426,7 @@ public override bool IsValid(object? value)
                 {
                     convertedValue = ConvertValue(value, formatProvider);
                 }
-                catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)
+                catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)
                 {
                     return false;
                 }
diff --git a/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/OptionsExtendingSystemClassTest.netcore.g.cs b/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/OptionsExtendingSystemClassTest.netcore.g.cs
@@ -268,7 +268,7 @@ public override bool IsValid(object? value)
             {
                 convertedValue = ConvertValue(value, formatProvider);
             }
-            catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)
+            catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)
             {
                 return false;
             }
diff --git a/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/OptionsExtendingSystemClassTest.netfx.g.cs b/src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Baselines/OptionsExtendingSystemClassTest.netfx.g.cs
@@ -256,7 +256,7 @@ public override bool IsValid(object? value)
             {
                 convertedValue = ConvertValue(value, formatProvider);
             }
-            catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)
+            catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)
             {
                 return false;
             }
diff --git a/src/libraries/Microsoft.Extensions.Options/tests/SourceGenerationTests/Baselines/NetCoreApp/Validators.g.cs b/src/libraries/Microsoft.Extensions.Options/tests/SourceGenerationTests/Baselines/NetCoreApp/Validators.g.cs
@@ -2678,7 +2678,7 @@ public override bool IsValid(object? value)
                 {
                     convertedValue = ConvertValue(value, formatProvider);
                 }
-                catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)
+                catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)
                 {
                     return false;
                 }
diff --git a/src/libraries/Microsoft.Extensions.Options/tests/SourceGenerationTests/Baselines/NetFX/Validators.g.cs b/src/libraries/Microsoft.Extensions.Options/tests/SourceGenerationTests/Baselines/NetFX/Validators.g.cs
@@ -2466,7 +2466,7 @@ public override bool IsValid(object? value)
                 {
                     convertedValue = ConvertValue(value, formatProvider);
                 }
-                catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)
+                catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)
                 {
                     return false;
                 }
diff --git a/src/libraries/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/RangeAttribute.cs b/src/libraries/System.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/RangeAttribute.cs
@@ -157,6 +157,10 @@ public override bool IsValid(object? value)
             {
                 return false;
             }
+            catch (OverflowException)
+            {
+                return false;
+            }
 
             var min = (IComparable)Minimum;
             var max = (IComparable)Maximum;
diff --git a/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/RangeAttributeTests.cs b/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/RangeAttributeTests.cs
@@ -95,6 +95,9 @@ protected override IEnumerable<TestCase> InvalidValues()
             yield return new TestCase(intRange, new object());
             // Implements IConvertible (throws NotSupportedException - is caught)
             yield return new TestCase(intRange, new IConvertibleImplementor() { IntThrow = new NotSupportedException() });
+            // Values that overflow int range (throws OverflowException - should be caught)
+            yield return new TestCase(intRange, 2147483648L);
+            yield return new TestCase(intRange, -2147483649L);
 
             intRange = new RangeAttribute(0, 10) { MinimumIsExclusive = true };
             yield return new TestCase(intRange, -1);
@@ -980,10 +983,12 @@ public static void Validate_MinimumOrMaximumCantBeConvertedToDateTime_ThrowsForm
         [Theory]
         [InlineData(1, 2, "2147483648")]
         [InlineData(1, 2, "-2147483649")]
-        public static void Validate_IntConversionOverflows_ThrowsOverflowException(int minimum, int maximum, object value)
+        [InlineData(-50, 50, 2147483648L)]
+        [InlineData(-50, 50, -2147483649L)]
+        public static void Validate_IntConversionOverflows_ReturnsFalse(int minimum, int maximum, object value)
         {
             RangeAttribute attribute = new RangeAttribute(minimum, maximum);
-            Assert.Throws<OverflowException>(() => attribute.Validate(value, new ValidationContext(new object())));
+            Assert.False(attribute.IsValid(value));
         }
 
         [Fact]

Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,7 @@ public void EmitRangeAttribute(string modifier, string prefix, string className,`
`431`	`431`	`{`
`432`	`432`	`convertedValue = ConvertValue(value, formatProvider);`
`433`	`433`	`}`
`434`		`- catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)`
	`434`	`+ catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)`
`435`	`435`	`{`
`436`	`436`	`return false;`
`437`	`437`	`}`
`@@ -443,7 +443,7 @@ public void EmitRangeAttribute(string modifier, string prefix, string className,`
`443`	`443`	`{`
`444`	`444`	`convertedValue = ConvertValue(value, formatProvider);`
`445`	`445`	`}`
`446`		`- catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)`
	`446`	`+ catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)`
`447`	`447`	`{`
`448`	`448`	`return false;`
`449`	`449`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public override bool IsValid(object? value)`
`153`	`153`	`{`
`154`	`154`	`convertedValue = ConvertValue(value, formatProvider);`
`155`	`155`	`}`
`156`		`- catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)`
	`156`	`+ catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)`
`157`	`157`	`{`
`158`	`158`	`return false;`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public override bool IsValid(object? value)`
`149`	`149`	`{`
`150`	`150`	`convertedValue = ConvertValue(value, formatProvider);`
`151`	`151`	`}`
`152`		`- catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)`
	`152`	`+ catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)`
`153`	`153`	`{`
`154`	`154`	`return false;`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ public override bool IsValid(object? value)`
`513`	`513`	`{`
`514`	`514`	`convertedValue = ConvertValue(value, formatProvider);`
`515`	`515`	`}`
`516`		`- catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)`
	`516`	`+ catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)`
`517`	`517`	`{`
`518`	`518`	`return false;`
`519`	`519`	`}`
Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,7 @@ public override bool IsValid(object? value)`
`426`	`426`	`{`
`427`	`427`	`convertedValue = ConvertValue(value, formatProvider);`
`428`	`428`	`}`
`429`		`- catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)`
	`429`	`+ catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)`
`430`	`430`	`{`
`431`	`431`	`return false;`
`432`	`432`	`}`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ public override bool IsValid(object? value)`
`268`	`268`	`{`
`269`	`269`	`convertedValue = ConvertValue(value, formatProvider);`
`270`	`270`	`}`
`271`		`- catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)`
	`271`	`+ catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)`
`272`	`272`	`{`
`273`	`273`	`return false;`
`274`	`274`	`}`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ public override bool IsValid(object? value)`
`256`	`256`	`{`
`257`	`257`	`convertedValue = ConvertValue(value, formatProvider);`
`258`	`258`	`}`
`259`		`- catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)`
	`259`	`+ catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)`
`260`	`260`	`{`
`261`	`261`	`return false;`
`262`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2678,7 +2678,7 @@ public override bool IsValid(object? value)`
`2678`	`2678`	`{`
`2679`	`2679`	`convertedValue = ConvertValue(value, formatProvider);`
`2680`	`2680`	`}`
`2681`		`- catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException)`
	`2681`	`+ catch (global::System.Exception e) when (e is global::System.FormatException or global::System.InvalidCastException or global::System.NotSupportedException or global::System.OverflowException)`
`2682`	`2682`	`{`
`2683`	`2683`	`return false;`
`2684`	`2684`	`}`