Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix null pointer dereferencing in structmember.c PyMember_SetOne() for T_CHAR. _PyUnicode_AsStringAndSize() can return NULL without touching the len argument. Also remove unnecessary PyUnicode_Check(), _PyUnicode_AsStringAndSize() performance the test again. CID 486815

This commit is contained in:
Christian Heimes 2012-09-11 17:31:08 +02:00
parent 6d29352cfd 5557a9c73f
commit e9a6d62d9f
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Python/structmember.c
View File

@ -254,12 +254,8 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
char *string;
Py_ssize_t len;
if (!PyUnicode_Check(v)) {
PyErr_BadArgument();
return -1;
}
string = _PyUnicode_AsStringAndSize(v, &len);
if (len != 1) {
if (string == NULL || len != 1) {
PyErr_BadArgument();
return -1;
}