From 31b9410654d73c9d1121ae9eb0d1bb14e6d54448 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 3 Dec 2015 01:02:03 +0200
Subject: [PATCH] Issue #25709: Fixed problem with in-place string
 concatenation and utf-8 cache.

---
 Lib/test/test_unicode.py | 17 +++++++++++++++++
 Misc/NEWS                |  5 +++++
 Objects/unicodeobject.c  |  5 +++++
 3 files changed, 27 insertions(+)

diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index f359082267d..ef0fd1c5f2f 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -2303,6 +2303,23 @@ class UnicodeTest(string_tests.CommonTest,
                 self.assertNotEqual(abc, abcdef)
                 self.assertEqual(abcdef.decode('unicode_internal'), text)
 
+    @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 183ddd0819c..1f87a82fa18 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,8 +10,13 @@ What's New in Python 3.3.7?
 Core and Builtins
 -----------------
 
+- Issue #25709: Fixed problem with in-place string concatenation and utf-8 cache.
+
 - Issue #24407: Fix crash when dict is mutated while being updated.
 
+- Issue #24097: Fixed crash in object.__reduce__() if slot name is freed inside
+  __getattr__.
+
 - Issue #24096: Make warnings.warn_explicit more robust against mutation of the
   warnings.filters list.
 
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 2bc34c57307..cf4f8421eb6 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -679,6 +679,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);