Commitec65efe

authored

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

Instead, they crashed with ArgumentNullException due to null pointer passed to PyObject constructor. Fixed by adding a check for None.

1 parent4529fde commitec65efeCopy full SHA for ec65efe

File tree

+10

-0

lines changed

+10

-0

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,5 +71,13 @@ public void AsManagedObjectInvalidCast()`
`71`	`71`	`varlist=PythonEngine.Eval("list");`
`72`	`72`	`Assert.Throws<InvalidCastException>(()=>list.AsManagedObject(typeof(int)));`
`73`	`73`	`}`
	`74`	`+`
	`75`	`+[Test]`
	`76`	`+publicvoidUnaryMinus_ThrowsOnBadType()`
	`77`	`+{`
	`78`	`+dynamiclist=newPyList();`
	`79`	`+varerror=Assert.Throws<PythonException>(()=>list=-list);`
	`80`	`+Assert.AreEqual("TypeError",error.Type.Name);`
	`81`	`+}`
`74`	`82`	`}`
`75`	`83`	`}`

Lines changed: 2 additions & 0 deletions

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`	`returnfalse;`
`1400`	`1400`	`}`
	`1401`	`+Exceptions.ErrorCheck(res);`
`1401`	`1402`	`result=CheckNone(newPyObject(res));`
`1402`	`1403`	`returntrue;`
`1403`	`1404`	`}`
`@@ -1450,6 +1451,7 @@ public override bool TryUnaryOperation(UnaryOperationBinder binder, out object r`
`1450`	`1451`	`result=null;`
`1451`	`1452`	`returnfalse;`
`1452`	`1453`	`}`
	`1454`	`+Exceptions.ErrorCheck(res);`
`1453`	`1455`	`result=CheckNone(newPyObject(res));`
`1454`	`1456`	`returntrue;`
`1455`	`1457`	`}`

Comments

(0)