diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-15 00:27:43 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-15 00:27:43 (GMT) |
| commit | 2843aa8f53273c3f937eb60d900d48ff9381ad67 (patch) | |
| tree | a24b327e5d50b906ee2809aea99b5b2b2568b2f5 | |
| parent | 82feb1f360c26c78f0c5159609f3f697008a9238 (diff) | |
| download | cpython-2843aa8f53273c3f937eb60d900d48ff9381ad67.zip cpython-2843aa8f53273c3f937eb60d900d48ff9381ad67.tar.gz cpython-2843aa8f53273c3f937eb60d900d48ff9381ad67.tar.bz2 | |
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.
........
| -rwxr-xr-x | Lib/test/test_binascii.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/binascii.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Lib/test/test_binascii.py b/Lib/test/test_binascii.py index a631a6a..cd76dbb 100755 --- a/Lib/test/test_binascii.py +++ b/Lib/test/test_binascii.py @@ -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. diff --git a/Modules/binascii.c b/Modules/binascii.c index 51101b4..833283f 100644 --- a/Modules/binascii.c +++ b/Modules/binascii.c @@ -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; } |