summaryrefslogtreecommitdiff
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-07-08 00:26:36 +0200
committerVictor Stinner <victor.stinner@gmail.com>2014-07-08 00:26:36 +0200
commit630a4f63c539345a6432d6177931b5fcc2f18aa7 (patch)
treebed6342759b5925823a2ae7ece387925ad263ce2 /Lib
parentfd5d1b51d64280d938b7cdc9d78c632b21b45dff (diff)
downloadcpython-git-630a4f63c539345a6432d6177931b5fcc2f18aa7.tar.gz
Issue #11259: asynchat.async_chat().set_terminator() now raises a ValueError if
the number of received bytes is negative.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/asynchat.py2
-rw-r--r--Lib/test/test_asynchat.py8
2 files changed, 10 insertions, 0 deletions
diff --git a/Lib/asynchat.py b/Lib/asynchat.py
index 682dbd7314..6e16891d43 100644
--- a/Lib/asynchat.py
+++ b/Lib/asynchat.py
@@ -99,6 +99,8 @@ class async_chat(asyncore.dispatcher):
"""
if isinstance(term, str) and self.use_encoding:
term = bytes(term, self.encoding)
+ elif isinstance(term, int) and term < 0:
+ raise ValueError('the number of received bytes must be positive')
self.terminator = term
def get_terminator(self):
diff --git a/Lib/test/test_asynchat.py b/Lib/test/test_asynchat.py
index 34717399d5..84867ec820 100644
--- a/Lib/test/test_asynchat.py
+++ b/Lib/test/test_asynchat.py
@@ -304,5 +304,13 @@ class TestFifo(unittest.TestCase):
self.assertEqual(f.pop(), (0, None))
+class TestNotConnected(unittest.TestCase):
+ def test_disallow_negative_terminator(self):
+ # Issue #11259
+ client = asynchat.async_chat()
+ self.assertRaises(ValueError, client.set_terminator, -1)
+
+
+
if __name__ == "__main__":
unittest.main()