Issue #28648: Fixed crash in Py_DecodeLocale() in debug build on Mac OS X

when decode astral characters.

diff --cc Misc/NEWS
index 9909020aef930ff3603ca1981b662b040a948f03,73247ee2f2abcdc6ac11528fc96d886e0f331fdc..161de763e92a64649b667820735c0af3e5860d1c
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,8 -10,9 +10,11 @@@ What's New in Python 3.7.0 alpha 
  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
    empty compile-time PYTHONPATH components.
  

diff --cc Objects/unicodeobject.c
Simple merge