diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-11-20 06:47:21 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-11-20 06:47:21 (GMT) |
| commit | 144f77a981ecad8884e1a4e70db72e6fdb609103 (patch) | |
| tree | 259b8fadf04eb9fc07b7fae95d8164ea75847fd5 /Modules/_ctypes | |
| parent | 93ff8725b3f678586fbbc19d3d4b615b218300ff (diff) | |
| download | cpython-144f77a981ecad8884e1a4e70db72e6fdb609103.zip cpython-144f77a981ecad8884e1a4e70db72e6fdb609103.tar.gz cpython-144f77a981ecad8884e1a4e70db72e6fdb609103.tar.bz2 | |
Issue #28715: Added error checks for PyUnicode_AsUTF8().
Diffstat (limited to 'Modules/_ctypes')
| -rw-r--r-- | Modules/_ctypes/_ctypes.c | 5 | ||||
| -rw-r--r-- | Modules/_ctypes/callproc.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 2935292..2f3495e 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -734,8 +734,7 @@ PyCStructType_setattro(PyObject *self, PyObject *key, PyObject *value) return -1; if (value && PyUnicode_Check(key) && - /* XXX struni _PyUnicode_AsString can fail (also in other places)! */ - 0 == strcmp(_PyUnicode_AsString(key), "_fields_")) + _PyUnicode_EqualToASCIIString(key, "_fields_")) return PyCStructUnionType_update_stgdict(self, value, 1); return 0; } @@ -749,7 +748,7 @@ UnionType_setattro(PyObject *self, PyObject *key, PyObject *value) return -1; if (PyUnicode_Check(key) && - 0 == strcmp(_PyUnicode_AsString(key), "_fields_")) + _PyUnicode_EqualToASCIIString(key, "_fields_")) return PyCStructUnionType_update_stgdict(self, value, 0); return 0; } diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index 30e3a96..abd3bc9 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -1670,7 +1670,9 @@ POINTER(PyObject *self, PyObject *cls) return result; } if (PyUnicode_CheckExact(cls)) { - char *name = _PyUnicode_AsString(cls); + const char *name = PyUnicode_AsUTF8(cls); + if (name == NULL) + return NULL; buf = PyMem_Malloc(strlen(name) + 3 + 1); if (buf == NULL) return PyErr_NoMemory(); |