1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gh-89653: Add assertions to unicodeobject.h functions (#91800)

Browse Source
This commit is contained in:
Victor Stinner 2022-04-21 23:26:25 +02:00 committed by GitHub
parent 636ad7b47e
commit efe7fd4170
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Include/cpython/unicodeobject.h
View File

@ -314,6 +314,7 @@ static inline void* _PyUnicode_COMPACT_DATA(PyObject *op) {
} }
static inline void* _PyUnicode_NONCOMPACT_DATA(PyObject *op) { static inline void* _PyUnicode_NONCOMPACT_DATA(PyObject *op) {
assert(!PyUnicode_IS_COMPACT(op));
void *data = _PyUnicodeObject_CAST(op)->data.any; void *data = _PyUnicodeObject_CAST(op)->data.any;
assert(data != NULL); assert(data != NULL);
return data; return data;
@ -354,13 +355,16 @@ static inline void PyUnicode_WRITE(unsigned int kind, void *data,
Py_ssize_t index, Py_UCS4 value) Py_ssize_t index, Py_UCS4 value)
{ {
if (kind == PyUnicode_1BYTE_KIND) { if (kind == PyUnicode_1BYTE_KIND) {
assert(value <= 0xffU);
((Py_UCS1 *)data)[index] = (Py_UCS1)value; ((Py_UCS1 *)data)[index] = (Py_UCS1)value;
} }
else if (kind == PyUnicode_2BYTE_KIND) { else if (kind == PyUnicode_2BYTE_KIND) {
assert(value <= 0xffffU);
((Py_UCS2 *)data)[index] = (Py_UCS2)value; ((Py_UCS2 *)data)[index] = (Py_UCS2)value;
} }
else { else {
assert(kind == PyUnicode_4BYTE_KIND); assert(kind == PyUnicode_4BYTE_KIND);
assert(value <= 0x10ffffU);
((Py_UCS4 *)data)[index] = value; ((Py_UCS4 *)data)[index] = value;
} }
} }
@ -378,6 +382,7 @@ static inline Py_UCS4 PyUnicode_READ(unsigned int kind,
if (kind == PyUnicode_2BYTE_KIND) { if (kind == PyUnicode_2BYTE_KIND) {
return ((const Py_UCS2 *)data)[index]; return ((const Py_UCS2 *)data)[index];
} }
assert(kind == PyUnicode_4BYTE_KIND);
return ((const Py_UCS4 *)data)[index]; return ((const Py_UCS4 *)data)[index];
} }
#define PyUnicode_READ(kind, data, index) \ #define PyUnicode_READ(kind, data, index) \
@ -397,6 +402,7 @@ static inline Py_UCS4 PyUnicode_READ_CHAR(PyObject *unicode, Py_ssize_t index)
if (kind == PyUnicode_2BYTE_KIND) { if (kind == PyUnicode_2BYTE_KIND) {
return PyUnicode_2BYTE_DATA(unicode)[index]; return PyUnicode_2BYTE_DATA(unicode)[index];
} }
assert(kind == PyUnicode_4BYTE_KIND);
return PyUnicode_4BYTE_DATA(unicode)[index]; return PyUnicode_4BYTE_DATA(unicode)[index];
} }
#define PyUnicode_READ_CHAR(unicode, index) \ #define PyUnicode_READ_CHAR(unicode, index) \
@ -419,6 +425,7 @@ static inline Py_UCS4 PyUnicode_MAX_CHAR_VALUE(PyObject *op)
if (kind == PyUnicode_2BYTE_KIND) { if (kind == PyUnicode_2BYTE_KIND) {
return 0xffffU; return 0xffffU;
} }
assert(kind == PyUnicode_4BYTE_KIND);
return 0x10ffffU; return 0x10ffffU;
} }
#define PyUnicode_MAX_CHAR_VALUE(op) \ #define PyUnicode_MAX_CHAR_VALUE(op) \