mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

closes bpo-31608: Fix a crash in methods of a subclass of _collections.deque with a bad __new__(). (GH-3788)

Browse source
This commit is contained in:
Oren Milman 2018-09-11 21:46:55 +03:00 • committed by Benjamin Peterson
parent b4ec36200a
commit 24bd50bdcc
3 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Modules/_collectionsmodule.c
View file

@ -478,6 +478,7 @@ deque_inplace_concat(dequeobject *deque, PyObject *other)
static PyObject *
deque_copy(PyObject *deque, PyObject *Py_UNUSED(ignored))
{
PyObject *result;
dequeobject *old_deque = (dequeobject *)deque;
if (Py_TYPE(deque) == &deque_type) {
dequeobject *new_deque;
@ -502,11 +503,19 @@ deque_copy(PyObject *deque, PyObject *Py_UNUSED(ignored))
return NULL;
}
if (old_deque->maxlen < 0)
return PyObject_CallFunctionObjArgs((PyObject *)(Py_TYPE(deque)),
deque, NULL);
result = PyObject_CallFunctionObjArgs((PyObject *)(Py_TYPE(deque)),
deque, NULL);
else
return PyObject_CallFunction((PyObject *)(Py_TYPE(deque)), "Oi",
deque, old_deque->maxlen, NULL);
result = PyObject_CallFunction((PyObject *)(Py_TYPE(deque)), "Oi",
deque, old_deque->maxlen, NULL);
if (result != NULL && !PyObject_TypeCheck(result, &deque_type)) {
PyErr_Format(PyExc_TypeError,
"%.200s() must return a deque, not %.200s",
Py_TYPE(deque)->tp_name, Py_TYPE(result)->tp_name);
Py_DECREF(result);
return NULL;
}
return result;
}
PyDoc_STRVAR(copy_doc, "Return a shallow copy of a deque.");