diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-15 00:31:01 +0000 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-15 00:31:01 +0000 |
| commit | 46e4dd21c4ddb89f8771b629aca160c3affecf8c (patch) | |
| tree | f500b642e01b01f6a3b211eb3dc43a0e66916c64 | |
| parent | 0560e8a8f8e737688a377a0e934a892100fa19d0 (diff) | |
| download | cpython-46e4dd21c4ddb89f8771b629aca160c3affecf8c.tar.gz cpython-46e4dd21c4ddb89f8771b629aca160c3affecf8c.zip | |
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.
........
................
| -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 65de81b8c10..a35ec05633d 100755 --- a/Lib/test/test_binascii.py +++ b/Lib/test/test_binascii.py @@ -103,6 +103,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) diff --git a/Misc/NEWS b/Misc/NEWS index 36c232e3e2a..d0d761d1508 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -65,6 +65,9 @@ Core and Builtins 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 51101b412a5..833283f7c98 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; } |