commit b626643734dfd80780a1d301d4a96e57052aa262
author Serhiy Storchaka <storchaka@gmail.com> Sat Nov 12 14:28:06 2016 +0200
committer Serhiy Storchaka <storchaka@gmail.com> Sat Nov 12 14:28:06 2016 +0200
tree 0ad8c5998fd378b8be147d3bc93b80f73449cb6d
parent 07bcf05fcf3fd1d4001e8e3489162e6d67638285

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

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index cf4f842..24eda6b 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -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);