diff options
author | Thomas Kluyver <takowl@gmail.com> | 2017-05-23 04:27:52 +0100 |
---|---|---|
committer | Nick Coghlan <ncoghlan@gmail.com> | 2017-05-23 13:27:52 +1000 |
commit | f9169ce6b48c7cc7cc62d9eb5e4ee1ac7066d14b (patch) | |
tree | 956e51ea17f03913fed3f61be6bb0cf9bc96e9c6 /Lib/inspect.py | |
parent | e377416c10eb0bf055b0728cdcdc4488fdfd3b5f (diff) | |
download | cpython-git-f9169ce6b48c7cc7cc62d9eb5e4ee1ac7066d14b.tar.gz |
bpo-25532: Protect against infinite loops in inspect.unwrap() (#1717)
Some objects (like test mocks) auto-generate new objects on
attribute access, which can lead to an infinite loop in
inspect.unwrap().
Ensuring references are retained to otherwise temporary objects
and capping the size of the memo dict turns this case into a
conventional exception instead.
Diffstat (limited to 'Lib/inspect.py')
-rw-r--r-- | Lib/inspect.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py index 9c072eb074..9a843d6420 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -505,13 +505,16 @@ def unwrap(func, *, stop=None): def _is_wrapper(f): return hasattr(f, '__wrapped__') and not stop(f) f = func # remember the original func for error reporting - memo = {id(f)} # Memoise by id to tolerate non-hashable objects + # Memoise by id to tolerate non-hashable objects, but store objects to + # ensure they aren't destroyed, which would allow their IDs to be reused. + memo = {id(f): f} + recursion_limit = sys.getrecursionlimit() while _is_wrapper(func): func = func.__wrapped__ id_func = id(func) - if id_func in memo: + if (id_func in memo) or (len(memo) >= recursion_limit): raise ValueError('wrapper loop when unwrapping {!r}'.format(f)) - memo.add(id_func) + memo[id_func] = func return func # -------------------------------------------------- source code extraction |