changeset:   105068:9bf1ca6ce1fe
branch:      3.3
parent:      104977:7e66c5dc4218
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Sat Nov 12 14:28:06 2016 +0200
files:       Misc/NEWS Objects/unicodeobject.c
description:
Issue #28648: Fixed crash in Py_DecodeLocale() in debug build on Mac OS X
when decode astral characters.


diff -r 7e66c5dc4218 -r 9bf1ca6ce1fe Misc/NEWS
--- a/Misc/NEWS	Tue Nov 08 21:17:46 2016 +0200
+++ b/Misc/NEWS	Sat Nov 12 14:28:06 2016 +0200
@@ -10,6 +10,9 @@
 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 -r 7e66c5dc4218 -r 9bf1ca6ce1fe Objects/unicodeobject.c
--- a/Objects/unicodeobject.c	Tue Nov 08 21:17:46 2016 +0200
+++ b/Objects/unicodeobject.c	Sat Nov 12 14:28:06 2016 +0200
@@ -4896,7 +4896,7 @@
 #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);