Issue #25678: Copy buffer objects to null-terminated strings.
Avoid buffer overreads when int(), long(), float(), and compile()
are passed buffer objects. Similar code is removed from the
complex() constructor, where it was not reachable.
Patch backported from issue #24802 by Eryk Sun.
diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
index 5bf1d31..4224306 100644
--- a/Lib/test/test_float.py
+++ b/Lib/test/test_float.py
@@ -53,6 +53,36 @@
float('.' + '1'*1000)
float(unicode('.' + '1'*1000))
+ def test_non_numeric_input_types(self):
+ # Test possible non-numeric types for the argument x, including
+ # subclasses of the explicitly documented accepted types.
+ class CustomStr(str): pass
+ class CustomByteArray(bytearray): pass
+ factories = [str, bytearray, CustomStr, CustomByteArray, buffer]
+
+ if test_support.have_unicode:
+ class CustomUnicode(unicode): pass
+ factories += [unicode, CustomUnicode]
+
+ for f in factories:
+ x = f(" 3.14 ")
+ msg = 'x has value %s and type %s' % (x, type(x).__name__)
+ try:
+ self.assertEqual(float(x), 3.14, msg=msg)
+ except TypeError, err:
+ raise AssertionError('For %s got TypeError: %s' %
+ (type(x).__name__, err))
+ errmsg = "could not convert"
+ with self.assertRaisesRegexp(ValueError, errmsg, msg=msg):
+ float(f('A' * 0x10))
+
+ def test_float_buffer(self):
+ self.assertEqual(float(buffer('12.3', 1, 3)), 2.3)
+ self.assertEqual(float(buffer('12.3\x00', 1, 3)), 2.3)
+ self.assertEqual(float(buffer('12.3 ', 1, 3)), 2.3)
+ self.assertEqual(float(buffer('12.3A', 1, 3)), 2.3)
+ self.assertEqual(float(buffer('12.34', 1, 3)), 2.3)
+
def check_conversion_to_int(self, x):
"""Check that int(x) has the correct value and type, for a float x."""
n = int(x)