[Zodb-checkins] CVS: ZODB3/BTrees/tests - testBTrees.py:1.48.4.2
Tim Peters
tim.one at comcast.net
Wed Jun 18 17:37:00 EDT 2003
Update of /cvs-repository/ZODB3/BTrees/tests
In directory cvs.zope.org:/tmp/cvs-serv24959/BTrees/tests
Modified Files:
Tag: ZODB3-3_1-branch
testBTrees.py
Log Message:
Backport.
BTreeItems_seek(): If a BTree mutates via deletion while it's being
iterated over, the iterator object can end up pointing into trash memory,
leading to a segfault. Catch this case and raise an exception instead.
=== ZODB3/BTrees/tests/testBTrees.py 1.48.4.1 => 1.48.4.2 ===
--- ZODB3/BTrees/tests/testBTrees.py:1.48.4.1 Tue Jan 14 17:25:13 2003
+++ ZODB3/BTrees/tests/testBTrees.py Wed Jun 18 16:36:59 2003
@@ -770,6 +770,30 @@
self.assertEqual(t.insert(1, 1) , 1)
self.assertEqual(lsubtract(list(t.keys()), [0,1]) , [])
+ def testDamagedIterator(self):
+ # A cute one from Steve Alexander. This caused the BTreeItems
+ # object to go insane, accessing memory beyond the allocated part
+ # of the bucket. If it fails, the symptom is either a C-level
+ # assertion error (if the BTree code was compiled without NDEBUG),
+ # or most likely a segfault (if the BTree code was compiled with
+ # NDEBUG).
+
+ t = self.t.__class__()
+ self._populate(t, 10)
+ # In order for this to fail, it's important that k be a "lazy"
+ # iterator, referring to the BTree by indirect position (index)
+ # instead of a fully materialized list. Then the position can
+ # end up pointing into trash memory, if the bucket pointed to
+ # shrinks.
+ k = t.keys()
+ for dummy in range(20):
+ try:
+ del t[k[0]]
+ except RuntimeError, detail:
+ self.assertEqual(str(detail), "the bucket being iterated "
+ "changed size")
+ break
+
## BTree tests
class TestIOBTrees(BTreeTests, TestCase):
More information about the Zodb-checkins
mailing list