From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 7 Jul 2014 22:26:36 +0000 (+0200)
Subject: Issue #11259: asynchat.async_chat().set_terminator() now raises a ValueError if
X-Git-Tag: v3.4.2rc1~251
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=630a4f63c539345a6432d6177931b5fcc2f18aa7;p=python

Issue #11259: asynchat.async_chat().set_terminator() now raises a ValueError if
the number of received bytes is negative.
---

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()
diff --git a/Misc/NEWS b/Misc/NEWS
index b7e73e9d04..907e1401a4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #11259: asynchat.async_chat().set_terminator() now raises a ValueError
+  if the number of received bytes is negative.
+
 - Issue #12523: asynchat.async_chat.push() now raises a TypeError if it doesn't
   get a bytes string