From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 2 Dec 2015 23:02:03 +0000 (+0200)
Subject: Issue #25709: Fixed problem with in-place string concatenation and utf-8 cache.
X-Git-Tag: v3.5.1~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e800941d66c432d29926f142085e29eca4abf6f3;p=thirdparty%2FPython%2Fcpython.git

Issue #25709: Fixed problem with in-place string concatenation and utf-8 cache.
---

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 56a60df00773..d7f37c59556b 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -2699,6 +2699,23 @@ class UnicodeTest(string_tests.CommonTest,
         self.assertTrue(astral >= bmp2)
         self.assertFalse(astral >= astral2)
 
+    @support.cpython_only
+    def test_pep393_utf8_caching_bug(self):
+        # Issue #25709: Problem with string concatenation and utf-8 cache
+        from _testcapi import getargs_s_hash
+        for k in 0x24, 0xa4, 0x20ac, 0x1f40d:
+            s = ''
+            for i in range(5):
+                # Due to CPython specific optimization the 's' string can be
+                # resized in-place.
+                s += chr(k)
+                # Parsing with the "s#" format code calls indirectly
+                # PyUnicode_AsUTF8AndSize() which creates the UTF-8
+                # encoded string cached in the Unicode object.
+                self.assertEqual(getargs_s_hash(s), chr(k).encode() * (i + 1))
+                # Check that the second call returns the same result
+                self.assertEqual(getargs_s_hash(s), chr(k).encode() * (i + 1))
+
 
 class StringModuleTest(unittest.TestCase):
     def test_formatter_parser(self):
diff --git a/Misc/NEWS b/Misc/NEWS
index 159d3d138525..baab4b55120d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,9 +10,14 @@ Release date: 2015-12-06
 Core and Builtins
 -----------------
 
-Library
+- Issue #25709: Fixed problem with in-place string concatenation and utf-8 cache.
+
+Windows
 -------
 
+- Issue #25715: Python 3.5.1 installer shows wrong upgrade path and incorrect
+  logic for launcher detection.
+
 
 What's New in Python 3.5.1 release candidate 1?
 ===============================================
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 8b885dfec2b3..0b78301f2362 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -722,6 +722,11 @@ resize_compact(PyObject *unicode, Py_ssize_t length)
     }
     new_size = (struct_size + (length + 1) * char_size);
 
+    if (_PyUnicode_HAS_UTF8_MEMORY(unicode)) {
+        PyObject_DEL(_PyUnicode_UTF8(unicode));
+        _PyUnicode_UTF8(unicode) = NULL;
+        _PyUnicode_UTF8_LENGTH(unicode) = 0;
+    }
     _Py_DEC_REFTOTAL;
     _Py_ForgetReference(unicode);