D2553: templatefilters: avoid infinite recursion bug in stringify
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Fri Mar 2 11:18:54 EST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG9b6b02a5b589: templatefilters: avoid infinite recursion bug in stringify (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2553?vs=6349&id=6362
REVISION DETAIL
https://phab.mercurial-scm.org/D2553
AFFECTED FILES
mercurial/templatefilters.py
CHANGE DETAILS
diff --git a/mercurial/templatefilters.py b/mercurial/templatefilters.py
--- a/mercurial/templatefilters.py
+++ b/mercurial/templatefilters.py
@@ -376,6 +376,12 @@
"""
thing = templatekw.unwraphybrid(thing)
if util.safehasattr(thing, '__iter__') and not isinstance(thing, bytes):
+ if isinstance(thing, str):
+ # This is only reachable on Python 3 (otherwise
+ # isinstance(thing, bytes) would have been true), and is
+ # here to prevent infinite recursion bugs on Python 3.
+ raise error.ProgrammingError(
+ 'stringify got unexpected unicode string: %r' % thing)
return "".join([stringify(t) for t in thing if t is not None])
if thing is None:
return ""
To: durin42, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list