summaryrefslogtreecommitdiff
path: root/Objects
diff options
context:
space:
mode:
authorYury Selivanov <yury@magic.io>2016-10-28 19:01:21 -0400
committerYury Selivanov <yury@magic.io>2016-10-28 19:01:21 -0400
commit00df4f07d475db9ded8aa922e3b9ae3d2cf7740d (patch)
tree8a53ac8a5ec9062741c1d6934e5077436c59a226 /Objects
parent45091623b1c235d25af479d190cf097738031588 (diff)
downloadcpython-00df4f07d475db9ded8aa922e3b9ae3d2cf7740d.tar.gz
Issue #28544: Pass `PyObject*` to _PyDict_Pop, not `PyDictObject*`
Diffstat (limited to 'Objects')
-rw-r--r--Objects/dictobject.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 9f98f68135..62ca48490b 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1768,13 +1768,17 @@ PyDict_Next(PyObject *op, Py_ssize_t *ppos, PyObject **pkey, PyObject **pvalue)
/* Internal version of dict.pop(). */
PyObject *
-_PyDict_Pop(PyDictObject *mp, PyObject *key, PyObject *deflt)
+_PyDict_Pop(PyObject *dict, PyObject *key, PyObject *deflt)
{
Py_hash_t hash;
Py_ssize_t ix, hashpos;
PyObject *old_value, *old_key;
PyDictKeyEntry *ep;
PyObject **value_addr;
+ PyDictObject *mp;
+
+ assert(PyDict_Check(dict));
+ mp = (PyDictObject *)dict;
if (mp->ma_used == 0) {
if (deflt) {
@@ -2836,7 +2840,7 @@ dict_pop(PyDictObject *mp, PyObject *args)
if(!PyArg_UnpackTuple(args, "pop", 1, 2, &key, &deflt))
return NULL;
- return _PyDict_Pop(mp, key, deflt);
+ return _PyDict_Pop((PyObject*)mp, key, deflt);
}
static PyObject *