traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #7701: Fix crash in binascii.b2a_uu() in debug mode when given a 

1-byte argument.  Patch by Victor Stinner.
This commit is contained in:
Antoine Pitrou 2010-01-15 00:18:00 +00:00
parent 3ffa43db48
commit c391ad007b
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_binascii.py
View File

@ -109,6 +109,9 @@ class BinASCIITest(unittest.TestCase):
self.assertRaises(binascii.Error, binascii.b2a_uu, 46*"!") self.assertRaises(binascii.Error, binascii.b2a_uu, 46*"!")
# Issue #7701 (crash on a pydebug build)
self.assertEqual(binascii.b2a_uu('x'), '!> \n')
def test_crc32(self): def test_crc32(self):
crc = binascii.crc32("Test the CRC-32 of") crc = binascii.crc32("Test the CRC-32 of")
crc = binascii.crc32(" this string.", crc) crc = binascii.crc32(" this string.", crc)

3
Misc/NEWS
View File

@ -33,6 +33,9 @@ Core and Builtins
Library Library
------- -------
- Issue #7701: Fix crash in binascii.b2a_uu() in debug mode when given a
1-byte argument. Patch by Victor Stinner.
- Issue #3299: Fix possible crash in the _sre module when given bad - Issue #3299: Fix possible crash in the _sre module when given bad
argument values in debug mode. Patch by Victor Stinner. argument values in debug mode. Patch by Victor Stinner.

2
Modules/binascii.c
View File

@ -294,7 +294,7 @@ binascii_b2a_uu(PyObject *self, PyObject *args)
} }
/* We're lazy and allocate to much (fixed up later) */ /* We're lazy and allocate to much (fixed up later) */
if ( (rv=PyString_FromStringAndSize(NULL, bin_len*2+2)) == NULL ) { if ( (rv=PyString_FromStringAndSize(NULL, 2 + (bin_len+2)/3*4)) == NULL ) {
PyBuffer_Release(&pbin); PyBuffer_Release(&pbin);
return NULL; return NULL;
} }