Commitb2c15a4

committed

ImportHook: verify __import__ was not updated before overwriting it with original value

1 parent676fbb4 commitb2c15a4Copy full SHA for b2c15a4

File tree

-0

lines changed

-0

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,13 @@ static void RestoreImport()`
`61`	`61`	`{`
`62`	`62`	`IntPtrbuiltins=Runtime.GetBuiltins();`
`63`	`63`
	`64`	`+IntPtrexisting=Runtime.PyObject_GetAttr(builtins,PyIdentifier.__import__);`
	`65`	`+Runtime.XDecref(existing);`
	`66`	`+if(existing!=hook.ptr)`
	`67`	`+{`
	`68`	`+thrownewNotSupportedException("Unable to restore original __import__.");`
	`69`	`+}`
	`70`	`+`
`64`	`71`	`intres=Runtime.PyObject_SetAttr(builtins,PyIdentifier.__import__,py_import);`
`65`	`72`	`PythonException.ThrowIfIsNotZero(res);`
`66`	`73`	`Runtime.XDecref(py_import);`
`@@ -374,6 +381,8 @@ public static IntPtr __import__(IntPtr self, IntPtr argsRaw, IntPtr kw)`
`374`	`381`
`375`	`382`	`privatestaticboolIsLoadAll(BorrowedReferencefromList)`
`376`	`383`	`{`
	`384`	`+if(fromList==null)thrownewArgumentNullException(nameof(fromList));`
	`385`	`+`
`377`	`386`	`if(CLRModule.preload)`
`378`	`387`	`{`
`379`	`388`	`returnfalse;`

Comments

(0)