Add explicit check for correct next character in format at end of

format.  This will complain about illegal formats like "O#" instead of
ignoring the '#'.

diff --git a/Python/getargs.c b/Python/getargs.c
index f166921cbf12e7a3ce274dfe5aeb73d7ceb008f4..7931b33cf96924d2ecb8ed38e68e5600e35ec7a4 100644 (file)
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -256,6 +256,13 @@ vgetargs1(args, format, p_va, compat)
                        return 0;
                }
        }
+
+       if (*format != '\0' && !isalpha(*format) &&
+           *format != '|' && *format != ':' && *format != ';') {
+               PyErr_Format(PyExc_SystemError,
+                            "bad format string: %s", formatsave);
+               return 0;
+       }
        
        return 1;
 }