traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use _PyObject_CallMethodIdObjArgs() in _ctypes 

Issue #28915: Replace _PyObject_CallMethodId() with
_PyObject_CallMethodIdObjArgs() in unpickle(). _PyObject_CallMethodIdObjArgs()
avoids the creation of a temporary tuple and doesn't have to parse a format
string.

Replace _PyObject_CallMethodId() with _PyObject_GetAttrId()+PyObject_Call() for
the second call since it requires to "unpack" a tuple.

Add also a check in the type of the second parameter (state): it must be a
tuple.
This commit is contained in:
Victor Stinner 2016-12-09 15:18:31 +01:00
parent ddc120f4cf
commit 5670764812
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Modules/_ctypes/callproc.c
View File

@ -1631,25 +1631,33 @@ resize(PyObject *self, PyObject *args)
static PyObject *
unpickle(PyObject *self, PyObject *args)
{
PyObject *typ;
PyObject *state;
PyObject *result;
PyObject *tmp;
PyObject *typ, *state, *meth, *obj, *result;
_Py_IDENTIFIER(__new__);
_Py_IDENTIFIER(__setstate__);
if (!PyArg_ParseTuple(args, "OO", &typ, &state))
if (!PyArg_ParseTuple(args, "OO!", &typ, &PyTuple_Type, &state))
return NULL;
result = _PyObject_CallMethodId(typ, &PyId___new__, "O", typ);
if (result == NULL)
return NULL;
tmp = _PyObject_CallMethodId(result, &PyId___setstate__, "O", state);
if (tmp == NULL) {
Py_DECREF(result);
obj = _PyObject_CallMethodIdObjArgs(typ, &PyId___new__, typ, NULL);
if (obj == NULL)
return NULL;
meth = _PyObject_GetAttrId(obj, &PyId___setstate__);
if (meth == NULL) {
goto error;
}
Py_DECREF(tmp);
return result;
result = PyObject_Call(meth, state, NULL);
Py_DECREF(meth);
if (result == NULL) {
goto error;
}
Py_DECREF(result);
return obj;
error:
Py_DECREF(obj);
return NULL;
}
static PyObject *