summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-04-24 18:21:17 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-04-24 18:21:17 (GMT)
commitfb88636199c12f63d6c8c89f311cdafc91f30d2f (patch)
tree24b2758c45ac543fe9970f861ca091852a8f4a94 /Python
parentb962171414aa2cfe3dbfbd4294819a4153a7bd6c (diff)
downloadcpython-fb88636199c12f63d6c8c89f311cdafc91f30d2f.zip
cpython-fb88636199c12f63d6c8c89f311cdafc91f30d2f.tar.gz
cpython-fb88636199c12f63d6c8c89f311cdafc91f30d2f.tar.bz2
prevent the dict constructor from accepting non-string keyword args #8419
This adds PyArg_ValidateKeywordArguments, which checks that keyword arguments are all strings, using an optimized method if possible.
Diffstat (limited to 'Python')
-rw-r--r--Python/getargs.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/Python/getargs.c b/Python/getargs.c
index 17c5317..69f5018 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1607,6 +1607,21 @@ _PyArg_VaParseTupleAndKeywords_SizeT(PyObject *args,
return retval;
}
+int
+PyArg_ValidateKeywordArguments(PyObject *kwargs)
+{
+ if (!PyDict_CheckExact(kwargs)) {
+ PyErr_BadInternalCall();
+ return 0;
+ }
+ if (!_PyDict_HasOnlyStringKeys(kwargs)) {
+ PyErr_SetString(PyExc_TypeError,
+ "keyword arguments must be strings");
+ return 0;
+ }
+ return 1;
+}
+
#define IS_END_OF_FORMAT(c) (c == '\0' || c == ';' || c == ':')
static int