changeset: 105160:44874b20e612 parent: 105158:15e5e476e4a1 parent: 105159:6dd22ed7140e user: Serhiy Storchaka date: Wed Nov 16 20:03:03 2016 +0200 files: Objects/unicodeobject.c description: Issue #28701: _PyUnicode_EqualToASCIIId and _PyUnicode_EqualToASCIIString now require ASCII right argument and assert this condition in debug build. diff -r 15e5e476e4a1 -r 44874b20e612 Include/unicodeobject.h --- a/Include/unicodeobject.h Wed Nov 16 21:17:54 2016 +0530 +++ b/Include/unicodeobject.h Wed Nov 16 20:03:03 2016 +0200 @@ -2038,7 +2038,7 @@ #ifndef Py_LIMITED_API /* Test whether a unicode is equal to ASCII identifier. Return 1 if true, - 0 otherwise. Return 0 if any argument contains non-ASCII characters. + 0 otherwise. The right argument must be ASCII identifier. Any error occurs inside will be cleared before return. */ PyAPI_FUNC(int) _PyUnicode_EqualToASCIIId( @@ -2060,7 +2060,7 @@ #ifndef Py_LIMITED_API /* Test whether a unicode is equal to ASCII string. Return 1 if true, - 0 otherwise. Return 0 if any argument contains non-ASCII characters. + 0 otherwise. The right argument must be ASCII-encoded string. Any error occurs inside will be cleared before return. */ PyAPI_FUNC(int) _PyUnicode_EqualToASCIIString( diff -r 15e5e476e4a1 -r 44874b20e612 Objects/unicodeobject.c --- a/Objects/unicodeobject.c Wed Nov 16 21:17:54 2016 +0530 +++ b/Objects/unicodeobject.c Wed Nov 16 20:03:03 2016 +0200 @@ -11062,6 +11062,12 @@ { size_t len; assert(_PyUnicode_CHECK(unicode)); + assert(str); +#ifndef NDEBUG + for (const char *p = str; *p; p++) { + assert((unsigned char)*p < 128); + } +#endif if (PyUnicode_READY(unicode) == -1) { /* Memory error or bad data */ PyErr_Clear(); @@ -11082,6 +11088,11 @@ assert(_PyUnicode_CHECK(left)); assert(right->string); +#ifndef NDEBUG + for (const char *p = right->string; *p; p++) { + assert((unsigned char)*p < 128); + } +#endif if (PyUnicode_READY(left) == -1) { /* memory error or bad data */