fixed dynamic unary and binary operations not raising Python exception on failure (#1508)

lostmsu · web-flow · commit ec65efe30dfb · 2021-08-09T08:56:23.000+02:00
Instead, they crashed with ArgumentNullException due to null pointer passed to PyObject constructor. Fixed by adding a check for None.
diff --git a/src/embed_tests/TestPyObject.cs b/src/embed_tests/TestPyObject.cs
@@ -71,5 +71,13 @@ public void AsManagedObjectInvalidCast()
             var list = PythonEngine.Eval("list");
             Assert.Throws<InvalidCastException>(() => list.AsManagedObject(typeof(int)));
         }
+
+        [Test]
+        public void UnaryMinus_ThrowsOnBadType()
+        {
+            dynamic list = new PyList();
+            var error = Assert.Throws<PythonException>(() => list = -list);
+            Assert.AreEqual("TypeError", error.Type.Name);
+        }
     }
 }
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -1398,6 +1398,7 @@ public override bool TryBinaryOperation(BinaryOperationBinder binder, object arg
                     result = null;
                     return false;
             }
+            Exceptions.ErrorCheck(res);
             result = CheckNone(new PyObject(res));
             return true;
         }
@@ -1450,6 +1451,7 @@ public override bool TryUnaryOperation(UnaryOperationBinder binder, out object r
                     result = null;
                     return false;
             }
+            Exceptions.ErrorCheck(res);
             result = CheckNone(new PyObject(res));
             return true;
         }

Original file line number	Diff line number	Diff line change
`@@ -71,5 +71,13 @@ public void AsManagedObjectInvalidCast()`
`71`	`71`	`var list = PythonEngine.Eval("list");`
`72`	`72`	`Assert.Throws<InvalidCastException>(() => list.AsManagedObject(typeof(int)));`
`73`	`73`	`}`
	`74`	`+`
	`75`	`+ [Test]`
	`76`	`+ public void UnaryMinus_ThrowsOnBadType()`
	`77`	`+ {`
	`78`	`+ dynamic list = new PyList();`
	`79`	`+ var error = Assert.Throws<PythonException>(() => list = -list);`
	`80`	`+ Assert.AreEqual("TypeError", error.Type.Name);`
	`81`	`+ }`
`74`	`82`	`}`
`75`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1398,6 +1398,7 @@ public override bool TryBinaryOperation(BinaryOperationBinder binder, object arg`
`1398`	`1398`	`result = null;`
`1399`	`1399`	`return false;`
`1400`	`1400`	`}`
	`1401`	`+ Exceptions.ErrorCheck(res);`
`1401`	`1402`	`result = CheckNone(new PyObject(res));`
`1402`	`1403`	`return true;`
`1403`	`1404`	`}`
`@@ -1450,6 +1451,7 @@ public override bool TryUnaryOperation(UnaryOperationBinder binder, out object r`
`1450`	`1451`	`result = null;`
`1451`	`1452`	`return false;`
`1452`	`1453`	`}`
	`1454`	`+ Exceptions.ErrorCheck(res);`
`1453`	`1455`	`result = CheckNone(new PyObject(res));`
`1454`	`1456`	`return true;`
`1455`	`1457`	`}`