Merge pull request #1993 from losttech/bugs/BadBigInt200

filmor · web-flow · commit fb17907efd17 · 2022-10-29T01:27:34.000+02:00
Fix positive `PyInt` converted to negative `BigInteger`
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 ### Fixed
 
 -   Fixed objects leaking when Python attached event handlers to them even if they were later removed
+-   Fixed `PyInt` conversion to `BigInteger` and `System.String` produced incorrect result for values between 128 and 255.
 
 
 ## [3.0.0](https://github.com/pythonnet/pythonnet/releases/tag/v3.0.0) - 2022-09-29
diff --git a/src/embed_tests/TestPyInt.cs b/src/embed_tests/TestPyInt.cs
@@ -191,16 +191,23 @@ public void ToBigInteger()
             {
                 0, 1, 2,
                 0x10,
+                0x79,
+                0x80,
+                0x81,
+                0xFF,
                 0x123,
+                0x8000,
                 0x1234,
+                0x8001,
+                0x4000,
+                0xFF,
             };
             simpleValues = simpleValues.Concat(simpleValues.Select(v => -v)).ToArray();
 
-            foreach (var val in simpleValues)
-            {
-                var pyInt = new PyInt(val);
-                Assert.AreEqual((BigInteger)val, pyInt.ToBigInteger());
-            }
+            var expected = simpleValues.Select(v => new BigInteger(v)).ToArray();
+            var actual = simpleValues.Select(v => new PyInt(v).ToBigInteger()).ToArray();
+
+            CollectionAssert.AreEqual(expected, actual);
         }
 
         [Test]
diff --git a/src/runtime/PythonTypes/PyInt.cs b/src/runtime/PythonTypes/PyInt.cs
@@ -212,7 +212,7 @@ public BigInteger ToBigInteger()
                 offset++;
                 neg = true;
             }
-            byte[] littleEndianBytes = new byte[(hex.Length - offset + 1) / 2];
+            byte[] littleEndianBytes = new byte[(hex.Length - offset + 1) / 2 + 1];
             for (; offset < hex.Length; offset++)
             {
                 int littleEndianHexIndex = hex.Length - 1 - offset;

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ public BigInteger ToBigInteger()`
`212`	`212`	`offset++;`
`213`	`213`	`neg = true;`
`214`	`214`	`}`
`215`		`- byte[] littleEndianBytes = new byte[(hex.Length - offset + 1) / 2];`
	`215`	`+ byte[] littleEndianBytes = new byte[(hex.Length - offset + 1) / 2 + 1];`
`216`	`216`	`for (; offset < hex.Length; offset++)`
`217`	`217`	`{`
`218`	`218`	`int littleEndianHexIndex = hex.Length - 1 - offset;`