Convert error for UInt32

amos402 · amos402 · commit 97f00095362b · 2020-07-30T03:50:40.000+08:00
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -1,12 +1,10 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Globalization;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Security;
-using System.ComponentModel;
-using System.Linq.Expressions;
 
 namespace Python.Runtime
 {
@@ -666,6 +664,10 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo
                         else
                         {
                             ulong num = Runtime.PyLong_AsUnsignedLong64(op);
+                            if (num == ulong.MaxValue && Exceptions.ErrorOccurred())
+                            {
+                                goto convert_error;
+                            }
                             try
                             {
                                 result = Convert.ToUInt32(num);
@@ -692,7 +694,7 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo
                                 goto convert_error;
                             }
                         }
-                        ulong num = Runtime.PyLong_AsUnsignedLongLong(value);
+                        ulong num = Runtime.PyLong_AsUnsignedLongLong(op);
                         if (num == ulong.MaxValue && Exceptions.ErrorOccurred())
                         {
                             goto overflow;

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,10 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections;`
`3`	`3`	`using System.Collections.Generic;`
	`4`	`+using System.ComponentModel;`
`4`	`5`	`using System.Globalization;`
`5`		`-using System.Reflection;`
`6`	`6`	`using System.Runtime.InteropServices;`
`7`	`7`	`using System.Security;`
`8`		`-using System.ComponentModel;`
`9`		`-using System.Linq.Expressions;`
`10`	`8`
`11`	`9`	`namespace Python.Runtime`
`12`	`10`	`{`
`@@ -666,6 +664,10 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo`
`666`	`664`	`else`
`667`	`665`	`{`
`668`	`666`	`ulong num = Runtime.PyLong_AsUnsignedLong64(op);`
	`667`	`+ if (num == ulong.MaxValue && Exceptions.ErrorOccurred())`
	`668`	`+ {`
	`669`	`+ goto convert_error;`
	`670`	`+ }`
`669`	`671`	`try`
`670`	`672`	`{`
`671`	`673`	`result = Convert.ToUInt32(num);`
`@@ -692,7 +694,7 @@ private static bool ToPrimitive(IntPtr value, Type obType, out object result, bo`
`692`	`694`	`goto convert_error;`
`693`	`695`	`}`
`694`	`696`	`}`
`695`		`- ulong num = Runtime.PyLong_AsUnsignedLongLong(value);`
	`697`	`+ ulong num = Runtime.PyLong_AsUnsignedLongLong(op);`
`696`	`698`	`if (num == ulong.MaxValue && Exceptions.ErrorOccurred())`
`697`	`699`	`{`
`698`	`700`	`goto overflow;`