mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 17:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Issue #28701: _PyUnicode_EqualToASCIIId and _PyUnicode_EqualToASCIIString now

Browse source 
require ASCII right argument and assert this condition in debug build.
This commit is contained in:
Serhiy Storchaka 2016-11-16 20:02:44 +02:00
parent ecbca357c9
commit a83a6a3275
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Include/unicodeobject.h
View file

@ -2038,7 +2038,7 @@ PyAPI_FUNC(int) PyUnicode_Compare(
#ifndef Py_LIMITED_API #ifndef Py_LIMITED_API
/* Test whether a unicode is equal to ASCII identifier. Return 1 if true, /* 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. */ Any error occurs inside will be cleared before return. */
PyAPI_FUNC(int) _PyUnicode_EqualToASCIIId( PyAPI_FUNC(int) _PyUnicode_EqualToASCIIId(
@ -2060,7 +2060,7 @@ PyAPI_FUNC(int) PyUnicode_CompareWithASCIIString(
#ifndef Py_LIMITED_API #ifndef Py_LIMITED_API
/* Test whether a unicode is equal to ASCII string. Return 1 if true, /* 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. */ Any error occurs inside will be cleared before return. */
PyAPI_FUNC(int) _PyUnicode_EqualToASCIIString( PyAPI_FUNC(int) _PyUnicode_EqualToASCIIString(

11
Objects/unicodeobject.c
View file

@ -11081,6 +11081,12 @@ _PyUnicode_EqualToASCIIString(PyObject *unicode, const char *str)
{ {
size_t len; size_t len;
assert(_PyUnicode_CHECK(unicode)); 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) { if (PyUnicode_READY(unicode) == -1) {
/* Memory error or bad data */ /* Memory error or bad data */
PyErr_Clear(); PyErr_Clear();
@ -11101,6 +11107,11 @@ _PyUnicode_EqualToASCIIId(PyObject *left, _Py_Identifier *right)
assert(_PyUnicode_CHECK(left)); assert(_PyUnicode_CHECK(left));
assert(right->string); assert(right->string);
#ifndef NDEBUG
for (const char *p = right->string; *p; p++) {
assert((unsigned char)*p < 128);
}
#endif
if (PyUnicode_READY(left) == -1) { if (PyUnicode_READY(left) == -1) {
/* memory error or bad data */ /* memory error or bad data */