Commit1a2499b

authored

Merge pull requestpythonnet#273 from ArvidJB/isinstance_refcount_leak

Calling isinstance(x,t) repeatedly when x or t is not actually a CLR …

2 parents85db427 +b68e7a1 commit1a2499bCopy full SHA for 1a2499b

File tree

+24

-3

lines changed

+24

-3

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -281,8 +281,10 @@ static IntPtr DoInstanceCheck(IntPtr tp, IntPtr args, bool checkType)`
`281`	`281`	`{`
`282`	`282`	`ClassBasecb=GetManagedObject(tp)asClassBase;`
`283`	`283`
`284`		`-if(cb==null)`
	`284`	`+if(cb==null){`
	`285`	`+Runtime.Incref(Runtime.PyFalse);`
`285`	`286`	`returnRuntime.PyFalse;`
	`287`	`+}`
`286`	`288`
`287`	`289`	`using(PyListargsObj=newPyList(args))`
`288`	`290`	`{`
`@@ -296,12 +298,16 @@ static IntPtr DoInstanceCheck(IntPtr tp, IntPtr args, bool checkType)`
`296`	`298`	`else`
`297`	`299`	`otherType=arg.GetPythonType();`
`298`	`300`
`299`		`-if(Runtime.PyObject_TYPE(otherType.Handle)!=PyCLRMetaType)`
	`301`	`+if(Runtime.PyObject_TYPE(otherType.Handle)!=PyCLRMetaType){`
	`302`	`+Runtime.Incref(Runtime.PyFalse);`
`300`	`303`	`returnRuntime.PyFalse;`
	`304`	`+}`
`301`	`305`
`302`	`306`	`ClassBaseotherCb=GetManagedObject(otherType.Handle)asClassBase;`
`303`		`-if(otherCb==null)`
	`307`	`+if(otherCb==null){`
	`308`	`+Runtime.Incref(Runtime.PyFalse);`
`304`	`309`	`returnRuntime.PyFalse;`
	`310`	`+}`
`305`	`311`
`306`	`312`	`returnConverter.ToPython(cb.type.IsAssignableFrom(otherCb.type));`
`307`	`313`	`}`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,21 @@ def handler(self, x, args):`
`147`	`147`	`self.assertEqual(event_handler.value,3)`
`148`	`148`	`self.assertEqual(len(d.event_handlers),1)`
`149`	`149`
	`150`	`+deftest_isinstance(self):`
	`151`	`+fromSystemimportObject`
	`152`	`+fromSystemimportString`
	`153`	`+`
	`154`	`+a= [str(x)forxinrange(0,1000)]`
	`155`	`+b= [String(x)forxina]`
	`156`	`+`
	`157`	`+forxina:`
	`158`	`+self.assertFalse(isinstance(x,Object))`
	`159`	`+self.assertFalse(isinstance(x,String))`
	`160`	`+`
	`161`	`+forxinb:`
	`162`	`+self.assertTrue(isinstance(x,Object))`
	`163`	`+self.assertTrue(isinstance(x,String))`
	`164`	`+`
`150`	`165`
`151`	`166`	`deftest_suite():`
`152`	`167`	`returnunittest.makeSuite(SubClassTests)`

Comments

(0)