Fix OverflowException on 64bit due to bad cast

vmuriart · vmuriart · commit be28d3c9a4e4 · 2017-02-22T19:05:28.000-07:00
Error message was `OverflowException occurred. Arithmetic operation resulted in an overflow.` Link below explains in more detail the issue. This fixes the issue in both 32/64bit. https://www.codeproject.com/Answers/899343/How-to-fix-OverflowException-occurred-Arithmetic-o#answer2 Use keyword `long` instead of `System.Int64` Cast is safe. Thanks @denfromufa for the sources. http://stackoverflow.com/a/18173246/2230844 https://msdn.microsoft.com/en-us/library/x65fb868(v=vs.110).aspx
diff --git a/src/runtime/clrobject.cs b/src/runtime/clrobject.cs
@@ -11,7 +11,7 @@ internal CLRObject(object ob, IntPtr tp)
         {
             IntPtr py = Runtime.PyType_GenericAlloc(tp, 0);
 
-            var flags = (int)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
+            var flags = (long)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
             if ((flags & TypeFlags.Subclass) != 0)
             {
                 IntPtr dict = Marshal.ReadIntPtr(py, ObjectOffset.DictOffset(tp));
diff --git a/src/runtime/debughelper.cs b/src/runtime/debughelper.cs
@@ -89,7 +89,7 @@ internal static void DumpType(IntPtr type)
         internal static void DumpInst(IntPtr ob)
         {
             IntPtr tp = Runtime.PyObject_TYPE(ob);
-            var sz = (int)Marshal.ReadIntPtr(tp, TypeOffset.tp_basicsize);
+            var sz = (long)Marshal.ReadIntPtr(tp, TypeOffset.tp_basicsize);
 
             for (var i = 0; i < sz; i += IntPtr.Size)
             {
diff --git a/src/runtime/managedtype.cs b/src/runtime/managedtype.cs
@@ -28,7 +28,7 @@ internal static ManagedType GetManagedObject(IntPtr ob)
                     tp = ob;
                 }
 
-                var flags = (int)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
+                var flags = (long)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
                 if ((flags & TypeFlags.Managed) != 0)
                 {
                     IntPtr op = tp == ob
@@ -63,7 +63,7 @@ internal static bool IsManagedType(IntPtr ob)
                     tp = ob;
                 }
 
-                var flags = (int)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
+                var flags = (long)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
                 if ((flags & TypeFlags.Managed) != 0)
                 {
                     return true;
diff --git a/src/runtime/metatype.cs b/src/runtime/metatype.cs
@@ -247,7 +247,7 @@ public static void tp_dealloc(IntPtr tp)
         {
             // Fix this when we dont cheat on the handle for subclasses!
 
-            var flags = (int)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
+            var flags = (long)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);
             if ((flags & TypeFlags.Subclass) == 0)
             {
                 IntPtr gc = Marshal.ReadIntPtr(tp, TypeOffset.magic());

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ internal CLRObject(object ob, IntPtr tp)`
`11`	`11`	`{`
`12`	`12`	`IntPtr py = Runtime.PyType_GenericAlloc(tp, 0);`
`13`	`13`
`14`		`- var flags = (int)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);`
	`14`	`+ var flags = (long)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);`
`15`	`15`	`if ((flags & TypeFlags.Subclass) != 0)`
`16`	`16`	`{`
`17`	`17`	`IntPtr dict = Marshal.ReadIntPtr(py, ObjectOffset.DictOffset(tp));`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ internal static void DumpType(IntPtr type)`
`89`	`89`	`internal static void DumpInst(IntPtr ob)`
`90`	`90`	`{`
`91`	`91`	`IntPtr tp = Runtime.PyObject_TYPE(ob);`
`92`		`- var sz = (int)Marshal.ReadIntPtr(tp, TypeOffset.tp_basicsize);`
	`92`	`+ var sz = (long)Marshal.ReadIntPtr(tp, TypeOffset.tp_basicsize);`
`93`	`93`
`94`	`94`	`for (var i = 0; i < sz; i += IntPtr.Size)`
`95`	`95`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ internal static ManagedType GetManagedObject(IntPtr ob)`
`28`	`28`	`tp = ob;`
`29`	`29`	`}`
`30`	`30`
`31`		`- var flags = (int)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);`
	`31`	`+ var flags = (long)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);`
`32`	`32`	`if ((flags & TypeFlags.Managed) != 0)`
`33`	`33`	`{`
`34`	`34`	`IntPtr op = tp == ob`
`@@ -63,7 +63,7 @@ internal static bool IsManagedType(IntPtr ob)`
`63`	`63`	`tp = ob;`
`64`	`64`	`}`
`65`	`65`
`66`		`- var flags = (int)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);`
	`66`	`+ var flags = (long)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);`
`67`	`67`	`if ((flags & TypeFlags.Managed) != 0)`
`68`	`68`	`{`
`69`	`69`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ public static void tp_dealloc(IntPtr tp)`
`247`	`247`	`{`
`248`	`248`	`// Fix this when we dont cheat on the handle for subclasses!`
`249`	`249`
`250`		`- var flags = (int)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);`
	`250`	`+ var flags = (long)Marshal.ReadIntPtr(tp, TypeOffset.tp_flags);`
`251`	`251`	`if ((flags & TypeFlags.Subclass) == 0)`
`252`	`252`	`{`
`253`	`253`	`IntPtr gc = Marshal.ReadIntPtr(tp, TypeOffset.magic());`