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

Fix a potential segfault and various potentail refcount leaks 

in the cast() function.
This commit is contained in:
Thomas Heller 2006-08-01 16:54:43 +00:00
parent 5a51bf50b8
commit 3de83e9b61
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Modules/_ctypes/_ctypes.c
View File

@ -4521,32 +4521,30 @@ cast(void *ptr, PyObject *src, PyObject *ctype)
if (obj->b_objects == Py_None) {
Py_DECREF(Py_None);
obj->b_objects = PyDict_New();
if (!obj->b_objects) {
Py_DECREF(result);
return NULL;
if (obj->b_objects == NULL)
goto failed;
}
}
/* XXX(nnorwitz): shouldn't the INCREF only be done in an else? */
Py_INCREF(obj->b_objects);
result->b_objects = obj->b_objects;
if (result->b_objects) {
PyObject *index = PyLong_FromVoidPtr((void *)src);
PyObject *index;
int rc;
if (index == NULL) {
Py_DECREF(result);
return NULL;
}
Py_INCREF(obj->b_objects);
index = PyLong_FromVoidPtr((void *)src);
if (index == NULL)
goto failed;
rc = PyDict_SetItem(result->b_objects, index, src);
Py_DECREF(index);
if (rc == -1) {
Py_DECREF(result);
return NULL;
}
if (rc == -1)
goto failed;
}
}
/* Should we assert that result is a pointer type? */
memcpy(result->b_ptr, &ptr, sizeof(void *));
return (PyObject *)result;
failed:
Py_DECREF(result);
return NULL;
}
#ifdef CTYPES_UNICODE