mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Backed out changeset b9f7b1bf36aa

Browse source
This commit is contained in:
Victor Stinner 2013-03-06 01:09:24 +01:00
parent 313cac88c5
commit cf77da9fb5
2 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -10,9 +10,6 @@ What's New in Python 3.4.0 Alpha 1?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #17223: Fix PyUnicode_FromUnicode() on Windows (16-bit wchar_t type)
to reject invalid UTF-16 surrogate.
- Issue #17032: The "global" in the "NameError: global name 'x' is not defined" - Issue #17032: The "global" in the "NameError: global name 'x' is not defined"
error message has been removed. Patch by Ram Rachum. error message has been removed. Patch by Ram Rachum.

19
Objects/unicodeobject.c
View file

@ -1384,18 +1384,13 @@ find_maxchar_surrogates(const wchar_t *begin, const wchar_t *end,
for (iter = begin; iter < end; ) { for (iter = begin; iter < end; ) {
#if SIZEOF_WCHAR_T == 2 #if SIZEOF_WCHAR_T == 2
if (Py_UNICODE_IS_HIGH_SURROGATE(iter[0])) { if (Py_UNICODE_IS_HIGH_SURROGATE(iter[0])
if ((iter+1) < end && (iter+1) < end
&& Py_UNICODE_IS_LOW_SURROGATE(iter[1])) && Py_UNICODE_IS_LOW_SURROGATE(iter[1]))
{ {
ch = Py_UNICODE_JOIN_SURROGATES(iter[0], iter[1]); ch = Py_UNICODE_JOIN_SURROGATES(iter[0], iter[1]);
++(*num_surrogates); ++(*num_surrogates);
iter += 2; iter += 2;
}
else {
PyErr_SetString(PyExc_ValueError, "illegal UTF-16 surrogate");
return -1;
}
} }
else else
#endif #endif