Address a bug in the uuencode decoder, reported bu "donut" in SF bug

#127718: '@' and '`' seem to be confused.

diff --git a/Misc/NEWS b/Misc/NEWS
index 7651974a6660b9f4ae5c594e11ec428e1ef9bf88..67430a2a5cfb39ea892c6db035746b2877834cea 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -103,6 +103,8 @@ http://sourceforge.net/tracker/index.php?func=detail&aid=<id>&group_id=5470&atid
 - mpzmodule.c - make .binary() work on 64-bit system, make it compile with 
   Cygwin
 
+- #127718 - '@' were '`' seem to be confused.
+
 What's New in Python 2.0?
 =========================
 

diff --git a/Modules/binascii.c b/Modules/binascii.c
index 010e22d9c8fcf654ec5a5ba0cd04f634c48374dc..85edd044f6e8c51de9d7cb8808eadb11bc71bd16 100644 (file)
--- a/Modules/binascii.c
+++ b/Modules/binascii.c
@@ -204,7 +204,7 @@ binascii_a2b_uu(PyObject *self, PyObject *args)
                        /* Check the character for legality
                        ** The 64 in stead of the expected 63 is because
                        ** there are a few uuencodes out there that use
-                       ** '@' as zero instead of space.
+                       ** '`' as zero instead of space.
                        */
                        if ( this_ch < ' ' || this_ch > (' ' + 64)) {
                                PyErr_SetString(Error, "Illegal char");
@@ -232,8 +232,8 @@ binascii_a2b_uu(PyObject *self, PyObject *args)
        */
        while( ascii_len-- > 0 ) {
                this_ch = *ascii_data++;
-               /* Extra '@' may be written as padding in some cases */
-               if ( this_ch != ' ' && this_ch != '@' &&
+               /* Extra '`' may be written as padding in some cases */
+               if ( this_ch != ' ' && this_ch != ' '+64 &&
                     this_ch != '\n' && this_ch != '\r' ) {
                        PyErr_SetString(Error, "Trailing garbage");
                        Py_DECREF(rv);