summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2013-03-04 19:30:01 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2013-03-04 19:30:01 (GMT)
commit44d5214927e428e6837310fb0cb694b42f6d8bb6 (patch)
treed444df036c3c22a53eff4cb84f8419d389bf685d /Lib
parentaaef34483c294c79dfc4e96f3168eea0f6b0e3f8 (diff)
downloadcpython-44d5214927e428e6837310fb0cb694b42f6d8bb6.zip
cpython-44d5214927e428e6837310fb0cb694b42f6d8bb6.tar.gz
cpython-44d5214927e428e6837310fb0cb694b42f6d8bb6.tar.bz2
Issue #17278: Fix a crash in heapq.heappush() and heapq.heappop() when the list is being resized concurrently.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_heapq.py26
1 files changed, 26 insertions, 0 deletions
diff --git a/Lib/test/test_heapq.py b/Lib/test/test_heapq.py
index e0c49c1..20fb89c 100644
--- a/Lib/test/test_heapq.py
+++ b/Lib/test/test_heapq.py
@@ -319,6 +319,16 @@ def L(seqn):
return chain(map(lambda x:x, R(Ig(G(seqn)))))
+class SideEffectLT:
+ def __init__(self, value, heap):
+ self.value = value
+ self.heap = heap
+
+ def __lt__(self, other):
+ self.heap[:] = []
+ return self.value < other.value
+
+
class TestErrorHandling(TestCase):
module = None
@@ -370,6 +380,22 @@ class TestErrorHandling(TestCase):
self.assertRaises(TypeError, f, 2, N(s))
self.assertRaises(ZeroDivisionError, f, 2, E(s))
+ # Issue #17278: the heap may change size while it's being walked.
+
+ def test_heappush_mutating_heap(self):
+ heap = []
+ heap.extend(SideEffectLT(i, heap) for i in range(200))
+ # Python version raises IndexError, C version RuntimeError
+ with self.assertRaises((IndexError, RuntimeError)):
+ self.module.heappush(heap, SideEffectLT(5, heap))
+
+ def test_heappop_mutating_heap(self):
+ heap = []
+ heap.extend(SideEffectLT(i, heap) for i in range(200))
+ # Python version raises IndexError, C version RuntimeError
+ with self.assertRaises((IndexError, RuntimeError)):
+ self.module.heappop(heap)
+
class TestErrorHandlingPython(TestErrorHandling):
module = py_heapq