Thanks to visit codestin.com
Credit goes to github.com

Skip to content

ImportHook cleanup + PyObject.Length exception #1400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lostmsu merged 5 commits into from
Feb 27, 2021
Merged

ImportHook cleanup + PyObject.Length exception #1400

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f10641
PyImport test validate no initialization failures
lostmsu Feb 25, 2021
676fbb4
PyObject.Length raises an exception when object does not have a conce…
lostmsu Feb 25, 2021
b2c15a4
ImportHook: verify __import__ was not updated before overwriting it w…
lostmsu Feb 25, 2021
fefa322
drop _PyObject_GetDictPtr and use PyObject_GenericGetDict instead
lostmsu Feb 25, 2021
908316f
ImportHook: drop dead code around clr_prefix
lostmsu Feb 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ImportHook: verify __import__ was not updated before overwriting it w… 
…ith original value
  • Loading branch information
@lostmsu
lostmsu committed Feb 27, 2021
commit b2c15a4dafd6bdc02e79cf80cc48a91c2f0cb39b
9 changes: 9 additions & 0 deletions src/runtime/importhook.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@ static void RestoreImport()
{
IntPtr builtins = Runtime.GetBuiltins();

IntPtr existing = Runtime.PyObject_GetAttr(builtins, PyIdentifier.__import__);
Runtime.XDecref(existing);
if (existing != hook.ptr)
{
throw new NotSupportedException("Unable to restore original __import__.");
}

int res = Runtime.PyObject_SetAttr(builtins, PyIdentifier.__import__, py_import);
PythonException.ThrowIfIsNotZero(res);
Runtime.XDecref(py_import);
Expand Down Expand Up @@ -374,6 +381,8 @@ public static IntPtr __import__(IntPtr self, IntPtr argsRaw, IntPtr kw)

private static bool IsLoadAll(BorrowedReference fromList)
{
if (fromList == null) throw new ArgumentNullException(nameof(fromList));

if (CLRModule.preload)
{
return false;
Expand Down