Skip to content

Commit ca22750

Browse files
[3.12] gh-121474: Add threading.Barrier parties arg sanity check. (GH-121480) (GH-122443)
(cherry picked from commit d27a53f) Co-authored-by: Clinton <pygeek@users.noreply.github.com>
1 parent 9491d18 commit ca22750

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

Lib/test/lock_tests.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,6 +1013,10 @@ def multipass(self, results, n):
10131013
self.assertEqual(self.barrier.n_waiting, 0)
10141014
self.assertFalse(self.barrier.broken)
10151015

1016+
def test_constructor(self):
1017+
self.assertRaises(ValueError, self.barriertype, parties=0)
1018+
self.assertRaises(ValueError, self.barriertype, parties=-1)
1019+
10161020
def test_barrier(self, passes=1):
10171021
"""
10181022
Test that a barrier is passed in lockstep

Lib/threading.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,8 @@ def __init__(self, parties, action=None, timeout=None):
685685
default for all subsequent 'wait()' calls.
686686
687687
"""
688+
if parties < 1:
689+
raise ValueError("parties must be > 0")
688690
self._cond = Condition(Lock())
689691
self._action = action
690692
self._timeout = timeout
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix missing sanity check for ``parties`` arg in :class:`threading.Barrier`
2+
constructor. Patch by Clinton Christian (pygeek).

0 commit comments

Comments
 (0)