changeset:   105072:0b576ab589c5
parent:      105067:5f3b7ceb394c
parent:      105071:2cbd2ec6307d
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Sat Nov 12 14:37:11 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 5f3b7ceb394c -r 0b576ab589c5 Misc/NEWS
--- a/Misc/NEWS	Sat Nov 12 04:10:35 2016 -0500
+++ b/Misc/NEWS	Sat Nov 12 14:37:11 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 #28665: Improve speed of the STORE_DEREF opcode by 40%.
 
 - Issue #19398: Extra slash no longer added to sys.path components in case of
diff -r 5f3b7ceb394c -r 0b576ab589c5 Objects/unicodeobject.c
--- a/Objects/unicodeobject.c	Sat Nov 12 04:10:35 2016 -0500
+++ b/Objects/unicodeobject.c	Sat Nov 12 14:37:11 2016 +0200
@@ -5101,7 +5101,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);