From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 12 Nov 2016 12:28:06 +0000 (+0200)
Subject: Issue #28648: Fixed crash in Py_DecodeLocale() in debug build on Mac OS X
X-Git-Tag: v3.4.6rc1~6^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b626643734dfd80780a1d301d4a96e57052aa262;p=thirdparty%2FPython%2Fcpython.git

Issue #28648: Fixed crash in Py_DecodeLocale() in debug build on Mac OS X
when decode astral characters.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index c55dc4a2e015..d3489d1ecf95 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.3.7?
 Core and Builtins
 -----------------
 
+- Issue #28648: Fixed crash in Py_DecodeLocale() in debug build on Mac OS X
+  when decode astral characters.  Patch by Xiang Zhang.
+
 - Issue #26171: Fix possible integer overflow and heap corruption in
   zipimporter.get_data().
 
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index cf4f8421eb63..24eda6be9bfb 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4896,7 +4896,7 @@ _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size)
 #if SIZEOF_WCHAR_T == 4
             assert(0);
 #else
-            assert(Py_UNICODE_IS_SURROGATE(ch));
+            assert(ch > 0xFFFF && ch <= MAX_UNICODE);
             /*  compute and append the two surrogates: */
             unicode[outpos++] = (wchar_t)Py_UNICODE_HIGH_SURROGATE(ch);
             unicode[outpos++] = (wchar_t)Py_UNICODE_LOW_SURROGATE(ch);