diff options
author | Benjamin Peterson <benjamin@python.org> | 2015-04-04 10:52:36 -0400 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2015-04-04 10:52:36 -0400 |
commit | 1a6292194bdef5f4ee6298b95201b51564d1f93a (patch) | |
tree | 2410b3f04ffc6a78db1ac78b8181672489af1f8b | |
parent | de1c27feaa75feaa2b23dae92f0b35abb3d9b792 (diff) | |
download | cpython-git-1a6292194bdef5f4ee6298b95201b51564d1f93a.tar.gz |
fix refleak in deque_concat
-rw-r--r-- | Modules/_collectionsmodule.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c index 9f6c47f54a..2b70b2ba06 100644 --- a/Modules/_collectionsmodule.c +++ b/Modules/_collectionsmodule.c @@ -507,7 +507,7 @@ static PyObject *deque_copy(PyObject *deque); static PyObject * deque_concat(dequeobject *deque, PyObject *other) { - PyObject *new_deque; + PyObject *new_deque, *result; int rv; rv = PyObject_IsInstance(other, (PyObject *)&deque_type); @@ -523,7 +523,13 @@ deque_concat(dequeobject *deque, PyObject *other) new_deque = deque_copy((PyObject *)deque); if (new_deque == NULL) return NULL; - return deque_inplace_concat((dequeobject *)new_deque, other); + result = deque_extend((dequeobject *)new_deque, other); + if (result == NULL) { + Py_DECREF(new_deque); + return NULL; + } + Py_DECREF(result); + return new_deque; } static void deque_clear(dequeobject *deque); |