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.
This commit is contained in:
Thomas Kluyver 2017-05-23 04:27:52 +01:00 committed by Nick Coghlan
parent e377416c10
commit f9169ce6b4
3 changed files with 28 additions and 3 deletions

View file

@ -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