From 45772cde7e6d936cb37a4762eba3ca23c0b1c667 Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Sat, 27 Oct 2001 03:58:40 +0000 Subject: [PATCH] PyArg_ParseTupleAndKeywords: do basic sanity checks on the arguments, 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. --- Python/getargs.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Python/getargs.c b/Python/getargs.c index 451b9140c6..840bf51d25 100644 --- a/Python/getargs.c +++ b/Python/getargs.c @@ -1005,7 +1005,16 @@ PyArg_ParseTupleAndKeywords(PyObject *args, { int retval; 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); retval = vgetargskeywords(args, keywords, format, kwlist, &va); va_end(va); @@ -1029,6 +1038,12 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format, int nkwds, pos, match, converted; 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 */ for (;;) { -- 2.40.0