Check (U)IntPtr size explicitly

filmor · filmor · commit 43f748b0321d · 2022-07-11T14:23:36.000+02:00
diff --git a/src/runtime/Runtime.cs b/src/runtime/Runtime.cs
@@ -59,6 +59,11 @@ private static string GetDefaultDllName(Version version)
         internal static bool TypeManagerInitialized => _typesInitialized;
         internal static readonly bool Is32Bit = IntPtr.Size == 4;
 
+        // Available in newer .NET Core versions (>= 5) as IntPtr.MaxValue etc.
+        internal static readonly long IntPtrMaxValue = Is32Bit ? Int32.MaxValue : Int64.MaxValue;
+        internal static readonly long IntPtrMinValue = Is32Bit ? Int32.MinValue : Int64.MinValue;
+        internal static readonly ulong UIntPtrMaxValue = Is32Bit ? UInt32.MaxValue : UInt64.MaxValue;
+
         // .NET core: System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
         internal static bool IsWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
 
diff --git a/src/runtime/Types/ClassObject.cs b/src/runtime/Types/ClassObject.cs
@@ -173,10 +173,15 @@ private static NewReference NewPrimitive(BorrowedReference tp, BorrowedReference
                 else if (Runtime.PyInt_Check(op))
                 {
                     long? num = Runtime.PyLong_AsLongLong(op);
-                    if (num is long n)
+                    if (num is long n && n >= Runtime.IntPtrMinValue && n <= Runtime.IntPtrMaxValue)
                     {
                         result = new IntPtr(n);
                     }
+                    else
+                    {
+                        Exceptions.SetError(Exceptions.OverflowError, "value not in range for IntPtr");
+                        return default;
+                    }
                 }
             }
 
@@ -200,10 +205,15 @@ private static NewReference NewPrimitive(BorrowedReference tp, BorrowedReference
                 else if (Runtime.PyInt_Check(op))
                 {
                     ulong? num = Runtime.PyLong_AsUnsignedLongLong(op);
-                    if (num is ulong n)
+                    if (num is ulong n && n < Runtime.UIntPtrMaxValue)
                     {
                         result = new UIntPtr(n);
                     }
+                    else
+                    {
+                        Exceptions.SetError(Exceptions.OverflowError, "value not in range for UIntPtr");
+                        return default;
+                    }
                 }
             }
 
diff --git a/tests/test_conversion.py b/tests/test_conversion.py
@@ -701,7 +701,7 @@ def test_intptr_construction():
         assert ob.IntPtrField.ToInt64() == v
 
     for v in [min_intptr - 1, max_intptr + 1]:
-        with pytest.raises(TypeError):
+        with pytest.raises(OverflowError):
             IntPtr(v)
 
     for v in [0, 1024, min_uintptr, max_uintptr, max_intptr]:
@@ -710,6 +710,6 @@ def test_intptr_construction():
         assert ob.UIntPtrField.ToUInt64() == v
 
     for v in [min_uintptr - 1, max_uintptr + 1, min_intptr]:
-        with pytest.raises(TypeError):
+        with pytest.raises(OverflowError):
             UIntPtr(v)
 

Original file line number	Diff line number	Diff line change
`@@ -173,10 +173,15 @@ private static NewReference NewPrimitive(BorrowedReference tp, BorrowedReference`
`173`	`173`	`else if (Runtime.PyInt_Check(op))`
`174`	`174`	`{`
`175`	`175`	`long? num = Runtime.PyLong_AsLongLong(op);`
`176`		`- if (num is long n)`
	`176`	`+ if (num is long n && n >= Runtime.IntPtrMinValue && n <= Runtime.IntPtrMaxValue)`
`177`	`177`	`{`
`178`	`178`	`result = new IntPtr(n);`
`179`	`179`	`}`
	`180`	`+ else`
	`181`	`+ {`
	`182`	`+ Exceptions.SetError(Exceptions.OverflowError, "value not in range for IntPtr");`
	`183`	`+ return default;`
	`184`	`+ }`
`180`	`185`	`}`
`181`	`186`	`}`
`182`	`187`
`@@ -200,10 +205,15 @@ private static NewReference NewPrimitive(BorrowedReference tp, BorrowedReference`
`200`	`205`	`else if (Runtime.PyInt_Check(op))`
`201`	`206`	`{`
`202`	`207`	`ulong? num = Runtime.PyLong_AsUnsignedLongLong(op);`
`203`		`- if (num is ulong n)`
	`208`	`+ if (num is ulong n && n < Runtime.UIntPtrMaxValue)`
`204`	`209`	`{`
`205`	`210`	`result = new UIntPtr(n);`
`206`	`211`	`}`
	`212`	`+ else`
	`213`	`+ {`
	`214`	`+ Exceptions.SetError(Exceptions.OverflowError, "value not in range for UIntPtr");`
	`215`	`+ return default;`
	`216`	`+ }`
`207`	`217`	`}`
`208`	`218`	`}`
`209`	`219`