Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 77508 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77508 | antoine.pitrou | 2010-01-15 01:27:43 +0100 (ven., 15 janv. 2010) | 10 lines

  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:
Antoine Pitrou 2010-01-15 00:31:01 +00:00
parent 0560e8a8f8
commit 46e4dd21c4
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

@ -103,6 +103,9 @@ class BinASCIITest(unittest.TestCase):
self.assertRaises(binascii.Error, binascii.b2a_uu, 46*b"!") 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): def test_crc32(self):
crc = binascii.crc32(b"Test the CRC-32 of") crc = binascii.crc32(b"Test the CRC-32 of")
crc = binascii.crc32(b" this string.", crc) crc = binascii.crc32(b" this string.", crc)

3
Misc/NEWS
View File

@ -65,6 +65,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=PyBytes_FromStringAndSize(NULL, bin_len*2+2)) == NULL ) { if ( (rv=PyBytes_FromStringAndSize(NULL, 2 + (bin_len+2)/3*4)) == NULL ) {
PyBuffer_Release(&pbin); PyBuffer_Release(&pbin);
return NULL; return NULL;
} }