Patchwork D2553: templatefilters: avoid infinite recursion bug in stringify

login
register
mail settings
Submitter phabricator
Date March 2, 2018, 4:18 p.m.
Message ID <6e59a2a15dea21039cc717d51790de20@localhost.localdomain>
Download mbox | patch
Permalink /patch/28698/
State Not Applicable
Headers show

Comments

phabricator - March 2, 2018, 4:18 p.m.
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




To: durin42, #hg-reviewers, pulkit
Cc: mercurial-devel

Patch

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