[2.1.x] Fixed CVE-2019-14235 -- Fixed potential memory exhaustion in django.utils.encoding.uri_to_iri().

Thanks to Guido Vranken for initial report.

1 files changed, 12 insertions, 2 deletions

diff --git a/tests/utils_tests/test_encoding.py b/tests/utils_tests/test_encoding.py
index bca6549fe7..1a279f66c2 100644
--- a/tests/utils_tests/test_encoding.py
+++ b/tests/utils_tests/test_encoding.py
@@ -1,4 +1,5 @@
 import datetime
+import sys
 import unittest
 from unittest import mock
 from urllib.parse import quote_plus
@@ -6,8 +7,8 @@ from urllib.parse import quote_plus
 from django.test import SimpleTestCase
 from django.utils.encoding import (
     DjangoUnicodeDecodeError, escape_uri_path, filepath_to_uri, force_bytes,
-    force_text, get_system_encoding, iri_to_uri, smart_bytes, smart_text,
-    uri_to_iri,
+    force_text, get_system_encoding, iri_to_uri, repercent_broken_unicode,
+    smart_bytes, smart_text, uri_to_iri,
 )
 from django.utils.functional import SimpleLazyObject
 from django.utils.translation import gettext_lazy
@@ -86,6 +87,15 @@ class TestEncodingUtils(SimpleTestCase):
         with mock.patch('locale.getdefaultlocale', side_effect=Exception):
             self.assertEqual(get_system_encoding(), 'ascii')
 
+    def test_repercent_broken_unicode_recursion_error(self):
+        # Prepare a string long enough to force a recursion error if the tested
+        # function uses recursion.
+        data = b'\xfc' * sys.getrecursionlimit()
+        try:
+            self.assertEqual(repercent_broken_unicode(data), b'%FC' * sys.getrecursionlimit())
+        except RecursionError:
+            self.fail('Unexpected RecursionError raised.')
+
 
 class TestRFC3987IEncodingUtils(unittest.TestCase):