Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.3 (#17328)

This commit is contained in:
Benjamin Peterson 2013-03-04 09:48:30 -05:00
parent 63f40d7af4 b1efa53662
commit 42f382facd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -13,6 +13,8 @@ Core and Builtins
- Issue #17032: The "global" in the "NameError: global name 'x' is not defined"
error message has been removed. Patch by Ram Rachum.
- 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.

4
Objects/dictobject.c
View File

@ -2235,14 +2235,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;