[Python-checkins] r77509 - in python/branches/release31-maint: Lib/test/test_binascii.py Misc/NEWS Modules/binascii.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Fri Jan 15 01:31:01 2010
New Revision: 77509

Log:
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.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_binascii.py
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Modules/binascii.c

Modified: python/branches/release31-maint/Lib/test/test_binascii.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_binascii.py	(original)
+++ python/branches/release31-maint/Lib/test/test_binascii.py	Fri Jan 15 01:31:01 2010
@@ -103,6 +103,9 @@
 
         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)

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Fri Jan 15 01:31:01 2010
@@ -65,6 +65,9 @@
 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.
 

Modified: python/branches/release31-maint/Modules/binascii.c
==============================================================================
--- python/branches/release31-maint/Modules/binascii.c	(original)
+++ python/branches/release31-maint/Modules/binascii.c	Fri Jan 15 01:31:01 2010
@@ -294,7 +294,7 @@
 	}
 
 	/* 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;
 	}