ada/cpython
0
0
Fork 0
mirror of https://github.com/AdaCore/cpython.git synced 2026-02-12 12:57:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

SF bug 486278 SystemError: Python/getargs.c:1086: bad.

Browse Source 
vgetargskeywords():  Now that this routine is checking for bad input
(rather than dump core in some cases), some bad calls are raising errors
that previously "worked".  This patch makes the error strings more
revealing, and changes the exceptions from SystemError to RuntimeError
(under the theory that SystemError is more of a "can't happen!" assert-
like thing, and so inappropriate for bad arguments to a public C API
function).
This commit is contained in:
Tim Peters
2001-11-29 03:26:37 +00:00
parent 42f5332f6d
commit cffed4bc21
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Python/getargs.c
View File

@@ -1049,7 +1049,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
/* Search the format:
message <- error msg, if any (else NULL).
name <- routine name, if any (else NULL).
fname <- routine name, if any (else NULL).
min <- # of required arguments, or -1 if all are required.
max <- most arguments (required + optional).
Check that kwlist has a non-NULL entry for each arg.
@@ -1064,8 +1064,9 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
if (isalpha(i) && i != 'e') {
max++;
if (*p == NULL) {
/* kwlist is too short */
PyErr_BadInternalCall();
PyErr_SetString(PyExc_RuntimeError,
"more argument specifiers than "
"keyword list entries");
return 0;
}
p++;
@@ -1081,15 +1082,17 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
break;
}
else if (i == '(') {
PyErr_SetString(PyExc_SystemError,
"tuple found in format when using keyword arguments");
PyErr_SetString(PyExc_RuntimeError,
"tuple found in format when using keyword "
"arguments");
return 0;
}
}
format = formatsave;
if (*p != NULL) {
/* kwlist is too long */
PyErr_BadInternalCall();
PyErr_SetString(PyExc_RuntimeError,
"more keyword list entries than "
"argument specifiers");
return 0;
}
if (min < 0) {