From: R David Murray <rdmurray@bitdance.com>
Date: Sat, 16 Jul 2016 01:29:13 +0000 (-0400)
Subject: #27522: break unintended cycle in feedparser.
X-Git-Tag: v3.6.0a4~167^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=702b0460d20fa699c1c703e00bcc93243e3020a1;p=thirdparty%2FPython%2Fcpython.git

#27522: break unintended cycle in feedparser.

Patch by Costas.
---

diff --git a/Lib/email/feedparser.py b/Lib/email/feedparser.py
index e2e3e96a1509..c54201819fa0 100644
--- a/Lib/email/feedparser.py
+++ b/Lib/email/feedparser.py
@@ -145,7 +145,7 @@ class FeedParser:
 
         """
         self.policy = policy
-        self._factory_kwds = lambda: {'policy': self.policy}
+        self._old_style_factory = False
         if _factory is None:
             # What this should be:
             #self._factory = policy.default_message_factory
@@ -160,7 +160,7 @@ class FeedParser:
                 _factory(policy=self.policy)
             except TypeError:
                 # Assume this is an old-style factory
-                self._factory_kwds = lambda: {}
+                self._old_style_factory = True
         self._input = BufferedSubFile()
         self._msgstack = []
         self._parse = self._parsegen().__next__
@@ -197,7 +197,10 @@ class FeedParser:
         return root
 
     def _new_message(self):
-        msg = self._factory(**self._factory_kwds())
+        if self._old_style_factory:
+            msg = self._factory()
+        else:
+            msg = self._factory(policy=self.policy)
         if self._cur and self._cur.get_content_type() == 'multipart/digest':
             msg.set_default_type('message/rfc822')
         if self._msgstack:
diff --git a/Misc/NEWS b/Misc/NEWS
index a13b2fb34b8c..75ca9b0133c9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -24,6 +24,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #27522: Avoid an unintentional reference cycle in email.feedparser.
+
 - Issue #26844: Fix error message for imp.find_module() to refer to 'path'
   instead of 'name'. Patch by Lev Maximov.