diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-06-04 19:34:43 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-06-04 19:34:43 (GMT) |
| commit | 9c474172cb3d645f766408082f75fa8395a08462 (patch) | |
| tree | 773b21460818d096a44b47b2adfda8d748474913 /Objects | |
| parent | df43379c7de2b3be398f86fc3b9840f3c17316e8 (diff) | |
| parent | 2ad80f53c1a9abf1d3d869a5e7902f30086f0df1 (diff) | |
| download | cpython-9c474172cb3d645f766408082f75fa8395a08462.zip cpython-9c474172cb3d645f766408082f75fa8395a08462.tar.gz cpython-9c474172cb3d645f766408082f75fa8395a08462.tar.bz2 | |
merge 3.5
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/odictobject.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Objects/odictobject.c b/Objects/odictobject.c index 313b21a..13ffdf1 100644 --- a/Objects/odictobject.c +++ b/Objects/odictobject.c @@ -2427,12 +2427,16 @@ mutablemapping_update(PyObject *self, PyObject *args, PyObject *kwargs) else if (PyObject_HasAttrString(other, "keys")) { /* never fails */ PyObject *keys, *iterator, *key; keys = PyObject_CallMethod(other, "keys", NULL); - if (keys == NULL) + if (keys == NULL) { + Py_DECREF(other); return NULL; + } iterator = PyObject_GetIter(keys); Py_DECREF(keys); - if (iterator == NULL) + if (iterator == NULL) { + Py_DECREF(other); return NULL; + } while (res == 0 && (key = PyIter_Next(iterator))) { PyObject *value = PyObject_GetItem(other, key); if (value != NULL) { |