diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-15 00:31:01 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-01-15 00:31:01 (GMT) |
commit | 46e4dd21c4ddb89f8771b629aca160c3affecf8c (patch) | |
tree | f500b642e01b01f6a3b211eb3dc43a0e66916c64 /Modules | |
parent | 0560e8a8f8e737688a377a0e934a892100fa19d0 (diff) | |
download | cpython-46e4dd21c4ddb89f8771b629aca160c3affecf8c.zip cpython-46e4dd21c4ddb89f8771b629aca160c3affecf8c.tar.gz cpython-46e4dd21c4ddb89f8771b629aca160c3affecf8c.tar.bz2 |
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.
........
................
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/binascii.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |