merge 3.4

This commit is contained in:
Benjamin Peterson 2015-02-02 17:47:31 -05:00
commit 0b2a6dc42b
1 changed files with 2 additions and 1 deletions

View File

@ -42,6 +42,7 @@ class TestPyEncodeBasestringAscii(TestEncodeBasestringAscii, PyTest): pass
class TestCEncodeBasestringAscii(TestEncodeBasestringAscii, CTest): class TestCEncodeBasestringAscii(TestEncodeBasestringAscii, CTest):
@bigaddrspacetest @bigaddrspacetest
def test_overflow(self): def test_overflow(self):
s = "\uffff"*((2**32)//6 + 1) size = (2**32)//6 + 1
s = "\x00"*size
with self.assertRaises(OverflowError): with self.assertRaises(OverflowError):
self.json.encoder.encode_basestring_ascii(s) self.json.encoder.encode_basestring_ascii(s)