1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PyArg_ParseTupleAndKeywords: do basic sanity checks on the arguments,

Browse Source 
and raise an error if they're insane.
vgetargskeywords:  the same, except that since this is an internal routine,
just assert that the arguments are sane.
This commit is contained in:
Tim Peters 2001-10-27 03:58:40 +00:00
parent a9f4739a1b
commit 45772cde7e
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Python/getargs.c
View File

@ -1005,7 +1005,16 @@ PyArg_ParseTupleAndKeywords(PyObject *args,
{ {
int retval; int retval;
va_list va; va_list va;
if ((args == NULL || !PyTuple_Check(args)) ||
(keywords != NULL && !PyDict_Check(keywords)) ||
format == NULL ||
kwlist == NULL)
{
PyErr_BadInternalCall();
return -1;
}
va_start(va, kwlist); va_start(va, kwlist);
retval = vgetargskeywords(args, keywords, format, kwlist, &va); retval = vgetargskeywords(args, keywords, format, kwlist, &va);
va_end(va); va_end(va);
@ -1029,6 +1038,12 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
int nkwds, pos, match, converted; int nkwds, pos, match, converted;
PyObject *key, *value; PyObject *key, *value;
assert(args != NULL && PyTuple_Check(args));
assert(keywords == NULL || PyDict_Check(keywords));
assert(format != NULL);
assert(kwlist != NULL);
assert(p_va != NULL);
/* nested tuples cannot be parsed when using keyword arguments */ /* nested tuples cannot be parsed when using keyword arguments */
for (;;) { for (;;) {