Commit43f748b

committed

Check (U)IntPtr size explicitly

1 parent775efd5 commit43f748bCopy full SHA for 43f748b

File tree

+19

-4

lines changed

+19

-4

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,11 @@ private static string GetDefaultDllName(Version version)`
`59`	`59`	`internalstaticboolTypeManagerInitialized=>_typesInitialized;`
`60`	`60`	`internalstaticreadonlyboolIs32Bit=IntPtr.Size==4;`
`61`	`61`
	`62`	`+// Available in newer .NET Core versions (>= 5) as IntPtr.MaxValue etc.`
	`63`	`+internalstaticreadonlylongIntPtrMaxValue=Is32Bit?Int32.MaxValue:Int64.MaxValue;`
	`64`	`+internalstaticreadonlylongIntPtrMinValue=Is32Bit?Int32.MinValue:Int64.MinValue;`
	`65`	`+internalstaticreadonlyulongUIntPtrMaxValue=Is32Bit?UInt32.MaxValue:UInt64.MaxValue;`
	`66`	`+`
`62`	`67`	`// .NET core: System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(OSPlatform.Windows)`
`63`	`68`	`internalstaticboolIsWindows=Environment.OSVersion.Platform==PlatformID.Win32NT;`
`64`	`69`

Lines changed: 12 additions & 2 deletions

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -701,7 +701,7 @@ def test_intptr_construction():`
`701`	`701`	`assertob.IntPtrField.ToInt64()==v`
`702`	`702`
`703`	`703`	`forvin [min_intptr-1,max_intptr+1]:`
`704`		`-withpytest.raises(TypeError):`
	`704`	`+withpytest.raises(OverflowError):`
`705`	`705`	`IntPtr(v)`
`706`	`706`
`707`	`707`	`forvin [0,1024,min_uintptr,max_uintptr,max_intptr]:`
`@@ -710,6 +710,6 @@ def test_intptr_construction():`
`710`	`710`	`assertob.UIntPtrField.ToUInt64()==v`
`711`	`711`
`712`	`712`	`forvin [min_uintptr-1,max_uintptr+1,min_intptr]:`
`713`		`-withpytest.raises(TypeError):`
	`713`	`+withpytest.raises(OverflowError):`
`714`	`714`	`UIntPtr(v)`
`715`	`715`

Comments

(0)