summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-03-04 09:47:50 -0500
committerBenjamin Peterson <benjamin@python.org>2013-03-04 09:47:50 -0500
commitb1efa53662385ba64289d9fe6fb8ca5b431c4119 (patch)
tree0b4aa7cebe47ada3cb12b4ef3d9a155fd79e2158
parent296069301ac51d95fe5e30b4abf518940f10346d (diff)
downloadcpython-git-b1efa53662385ba64289d9fe6fb8ca5b431c4119.tar.gz
fix possible setdefault refleak (closes #17328)
-rw-r--r--Misc/NEWS2
-rw-r--r--Objects/dictobject.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 0b1da99048..958cc1a7d4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 3.3.1?
Core and Builtins
-----------------
+- Issue #17328: Fix possible refleak in dict.setdefault.
+
- Issue #17223: array module: Fix a crasher when converting an array containing
invalid characters (outside range [U+0000; U+10ffff]) to Unicode:
repr(array), str(array) and array.tounicode(). Patch written by Manuel Jacob.
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index f4ad3dccd4..8c09e46f9b 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -2230,14 +2230,14 @@ dict_setdefault(register PyDictObject *mp, PyObject *args)
return NULL;
val = *value_addr;
if (val == NULL) {
- Py_INCREF(failobj);
- Py_INCREF(key);
if (mp->ma_keys->dk_usable <= 0) {
/* Need to resize. */
if (insertion_resize(mp) < 0)
return NULL;
ep = find_empty_slot(mp, key, hash, &value_addr);
}
+ Py_INCREF(failobj);
+ Py_INCREF(key);
MAINTAIN_TRACKING(mp, key, failobj);
ep->me_key = key;
ep->me_hash = hash;