diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-15 00:23:22 +0000 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-15 00:23:22 +0000 |
| commit | 4cf72aaafbf165c544a4fd7e9bd965bc4348646c (patch) | |
| tree | 4ad0915043345d2cb1e5933cff9254c1f4891729 | |
| parent | 47c8ede0b809980830818caa1e4957743eb25b3f (diff) | |
| download | cpython-git-4cf72aaafbf165c544a4fd7e9bd965bc4348646c.tar.gz | |
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 ea8be31c07..4ebf429ca6 100755 --- a/Lib/test/test_binascii.py +++ b/Lib/test/test_binascii.py @@ -104,6 +104,9 @@ class BinASCIITest(unittest.TestCase): 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): crc = binascii.crc32("Test the CRC-32 of") crc = binascii.crc32(" this string.", crc) @@ -48,6 +48,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 bcbafcffa9..65471a65a2 100644 --- a/Modules/binascii.c +++ b/Modules/binascii.c @@ -282,7 +282,7 @@ binascii_b2a_uu(PyObject *self, PyObject *args) } /* 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 ) return NULL; ascii_data = (unsigned char *)PyString_AsString(rv); |