summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2017-01-20 08:35:18 +0200
committerSerhiy Storchaka <storchaka@gmail.com>2017-01-20 08:35:18 +0200
commit299dc239fe79b06a7a270d0d9e3208f66f69d5b3 (patch)
tree35727ea35db2a17aca1edb530e4cb51526defcd2 /Python
parentaecbef408d178d387fabfb0eda28e3f0221c9dd7 (diff)
parent398ef5c08feabfdbf7d0b1e10817139f0e98eefd (diff)
downloadcpython-git-299dc239fe79b06a7a270d0d9e3208f66f69d5b3.tar.gz
Issue #29327: Fixed a crash when pass the iterable keyword argument to sorted().
Diffstat (limited to 'Python')
-rw-r--r--Python/bltinmodule.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index ab029ce0aa..6df8af4733 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -2128,7 +2128,7 @@ builtin_sorted(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwna
{
PyObject *newlist, *v, *seq, *keyfunc=NULL;
PyObject *callable;
- static const char * const kwlist[] = {"iterable", "key", "reverse", 0};
+ static const char * const kwlist[] = {"", "key", "reverse", 0};
/* args 1-3 should match listsort in Objects/listobject.c */
static _PyArg_Parser parser = {"O|Oi:sorted", kwlist, 0};
int reverse;
@@ -2147,6 +2147,7 @@ builtin_sorted(PyObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwna
return NULL;
}
+ assert(nargs >= 1);
v = _PyObject_FastCallKeywords(callable, args + 1, nargs - 1, kwnames);
Py_DECREF(callable);
if (v == NULL) {