[Python-checkins] r65637 - in python/trunk: Lib/test/test_dict.py Misc/NEWS Objects/dictobject.c
georg.brandl
python-checkins at python.org
Mon Aug 11 11:07:59 CEST 2008
Author: georg.brandl
Date: Mon Aug 11 11:07:59 2008
New Revision: 65637
Log:
- Issue #3537: Fix an assertion failure when an empty but presized dict
object was stored in the freelist.
Modified:
python/trunk/Lib/test/test_dict.py
python/trunk/Misc/NEWS
python/trunk/Objects/dictobject.c
Modified: python/trunk/Lib/test/test_dict.py
==============================================================================
--- python/trunk/Lib/test/test_dict.py (original)
+++ python/trunk/Lib/test/test_dict.py Mon Aug 11 11:07:59 2008
@@ -544,6 +544,17 @@
resizing = True
d[9] = 6
+ def test_empty_presized_dict_in_freelist(self):
+ # Bug #3537: if an empty but presized dict with a size larger
+ # than 7 was in the freelist, it triggered an assertion failure
+ try:
+ d = {'a': 1/0, 'b': None, 'c': None, 'd': None, 'e': None,
+ 'f': None, 'g': None, 'h': None}
+ except ZeroDivisionError:
+ pass
+ d = {}
+
+
from test import mapping_tests
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Mon Aug 11 11:07:59 2008
@@ -12,6 +12,9 @@
Core and Builtins
-----------------
+- Issue #3537: Fix an assertion failure when an empty but presized dict
+ object was stored in the freelist.
+
- Issue #1481296: Make long(float('nan')) and int(float('nan')) raise
ValueError consistently across platforms.
Modified: python/trunk/Objects/dictobject.c
==============================================================================
--- python/trunk/Objects/dictobject.c (original)
+++ python/trunk/Objects/dictobject.c Mon Aug 11 11:07:59 2008
@@ -241,6 +241,10 @@
_Py_NewReference((PyObject *)mp);
if (mp->ma_fill) {
EMPTY_TO_MINSIZE(mp);
+ } else {
+ /* At least set ma_table and ma_mask; these are wrong
+ if an empty but presized dict is added to freelist */
+ INIT_NONZERO_DICT_SLOTS(mp);
}
assert (mp->ma_used == 0);
assert (mp->ma_table == mp->ma_smalltable);
More information about the Python-checkins
mailing list