From b6b3cb9899214a23ebb0f4ebf0e0b300b0ee524f Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Wed, 4 Mar 2015 08:11:25 -0500
Subject: [PATCH] [1.6.x] Fixed an infinite loop possibility in strip_tags().

This is a security fix; disclosure to follow shortly.
---
 django/utils/html.py           |  6 ++++--
 docs/releases/1.6.11.txt       | 17 +++++++++++++++++
 tests/utils_tests/test_html.py |  3 +++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/django/utils/html.py b/django/utils/html.py
index 5d96f15daa..bb41f48b04 100644
--- a/django/utils/html.py
+++ b/django/utils/html.py
@@ -156,8 +156,10 @@ def strip_tags(value):
         if not ('<' in value or '>' in value):
             return value
         new_value = _strip_once(value)
-        if new_value == value:
-            # _strip_once was not able to detect more tags
+        if len(new_value) >= len(value):
+            # _strip_once was not able to detect more tags or length increased
+            # due to http://bugs.python.org/issue20288
+            # (affects Python 2 < 2.7.7 and Python 3 < 3.3.5)
             return value
         else:
             value = new_value
diff --git a/docs/releases/1.6.11.txt b/docs/releases/1.6.11.txt
index da10a44301..a7d020c004 100644
--- a/docs/releases/1.6.11.txt
+++ b/docs/releases/1.6.11.txt
@@ -5,3 +5,20 @@ Django 1.6.11 release notes
 *March 18, 2015*
 
 Django 1.6.11 fixes two security issues in 1.6.10.
+
+Denial-of-service possibility with ``strip_tags()``
+===================================================
+
+Last year :func:`~django.utils.html.strip_tags`  was changed to work
+iteratively. The problem is that the size of the input it's processing can
+increase on each iteration which results in an infinite loop in
+``strip_tags()``. This issue only affects versions of Python that haven't
+received  `a bugfix in HTMLParser <http://bugs.python.org/issue20288>`_; namely
+Python < 2.7.7 and 3.3.5. Some operating system vendors have also backported
+the fix for the Python bug into their packages of earlier versions.
+
+To remedy this issue, ``strip_tags()`` will now return the original input if
+it detects the length of the string it's processing increases. Remember that
+absolutely NO guarantee is provided about the results of ``strip_tags()`` being
+HTML safe. So NEVER mark safe the result of a ``strip_tags()`` call without
+escaping it first, for example with :func:`~django.utils.html.escape`.
diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py
index 9c1f22f01f..3682dcee68 100644
--- a/tests/utils_tests/test_html.py
+++ b/tests/utils_tests/test_html.py
@@ -80,6 +80,9 @@ class TestUtilsHtml(TestCase):
             ('a<p a >b</p>c', 'abc'),
             ('d<a:b c:d>e</p>f', 'def'),
             ('<strong>foo</strong><a href="http://example.com">bar</a>', 'foobar'),
+            # caused infinite loop on Pythons not patched with
+            # http://bugs.python.org/issue20288
+            ('&gotcha&#;<>', '&gotcha&#;<>'),
         )
         for value, output in items:
             self.check_output(f, value, output)