Merged revisions 77506 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77506 | antoine.pitrou | 2010-01-15 01:18:00 +0100 (ven., 15 janv. 2010) | 4 lines 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:
parent
82feb1f360
commit
2843aa8f53
|
@ -108,6 +108,9 @@ class BinASCIITest(unittest.TestCase):
|
|||
|
||||
self.assertRaises(binascii.Error, binascii.b2a_uu, 46*b"!")
|
||||
|
||||
# Issue #7701 (crash on a pydebug build)
|
||||
self.assertEqual(binascii.b2a_uu(b'x'), b'!> \n')
|
||||
|
||||
def test_crc32(self):
|
||||
crc = binascii.crc32(b"Test the CRC-32 of")
|
||||
crc = binascii.crc32(b" this string.", crc)
|
||||
|
|
|
@ -213,6 +213,9 @@ C-API
|
|||
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
|
||||
argument values in debug mode. Patch by Victor Stinner.
|
||||
|
||||
|
|
|
@ -294,7 +294,7 @@ binascii_b2a_uu(PyObject *self, PyObject *args)
|
|||
}
|
||||
|
||||
/* We're lazy and allocate to much (fixed up later) */
|
||||
if ( (rv=PyBytes_FromStringAndSize(NULL, bin_len*2+2)) == NULL ) {
|
||||
if ( (rv=PyBytes_FromStringAndSize(NULL, 2 + (bin_len+2)/3*4)) == NULL ) {
|
||||
PyBuffer_Release(&pbin);
|
||||
return NULL;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue