diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2015-01-27 20:17:56 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-01-27 20:17:56 (GMT) |
| commit | 0e0282eb144ed69616a2a7e0797cf31d58ab2276 (patch) | |
| tree | 8ef3f2b0736e22ca6d05aec526ca1e65b28bcb83 /Lib | |
| parent | 3ce465ab56568d5d53b1985cbb3ebe5961bfbf18 (diff) | |
| download | cpython-0e0282eb144ed69616a2a7e0797cf31d58ab2276.zip cpython-0e0282eb144ed69616a2a7e0797cf31d58ab2276.tar.gz cpython-0e0282eb144ed69616a2a7e0797cf31d58ab2276.tar.bz2 | |
Issue #23055: Fixed a buffer overflow in PyUnicode_FromFormatV. Analysis
and fix by Guido Vranken.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_unicode.py | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index f2018ec..625d08c 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -1700,6 +1700,9 @@ class UnicodeTest( if sys.maxunicode > 0xffff: check_format(u'\U0010ffff', b'%c', c_int(0x10ffff)) + else: + with self.assertRaises(OverflowError): + PyUnicode_FromFormat(b'%c', c_int(0x10000)) with self.assertRaises(OverflowError): PyUnicode_FromFormat(b'%c', c_int(0x110000)) # Issue #18183 @@ -1750,8 +1753,45 @@ class UnicodeTest( b'%zu', c_size_t(123)) # test long output + min_long = -(2 ** (8 * sizeof(c_long) - 1)) + max_long = -min_long - 1 + check_format(unicode(min_long), + b'%ld', c_long(min_long)) + check_format(unicode(max_long), + b'%ld', c_long(max_long)) + max_ulong = 2 ** (8 * sizeof(c_ulong)) - 1 + check_format(unicode(max_ulong), + b'%lu', c_ulong(max_ulong)) PyUnicode_FromFormat(b'%p', c_void_p(-1)) + # test padding (width and/or precision) + check_format(u'123'.rjust(10, u'0'), + b'%010i', c_int(123)) + check_format(u'123'.rjust(100), + b'%100i', c_int(123)) + check_format(u'123'.rjust(100, u'0'), + b'%.100i', c_int(123)) + check_format(u'123'.rjust(80, u'0').rjust(100), + b'%100.80i', c_int(123)) + + check_format(u'123'.rjust(10, u'0'), + b'%010u', c_uint(123)) + check_format(u'123'.rjust(100), + b'%100u', c_uint(123)) + check_format(u'123'.rjust(100, u'0'), + b'%.100u', c_uint(123)) + check_format(u'123'.rjust(80, u'0').rjust(100), + b'%100.80u', c_uint(123)) + + check_format(u'123'.rjust(10, u'0'), + b'%010x', c_int(0x123)) + check_format(u'123'.rjust(100), + b'%100x', c_int(0x123)) + check_format(u'123'.rjust(100, u'0'), + b'%.100x', c_int(0x123)) + check_format(u'123'.rjust(80, u'0').rjust(100), + b'%100.80x', c_int(0x123)) + # test %V check_format(u'repr=abc', b'repr=%V', u'abc', b'xyz') |