summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Shannon <mark@hotpy.org>2022-09-10 00:12:06 (GMT)
committerGitHub <noreply@github.com>2022-09-10 00:12:06 (GMT)
commit50a70a083d34305a52fac4f5901bff2ead152d68 (patch)
tree0284a73dc74d2d7fc11bed109a9177950d72f38b
parent72b29b2611eb7d161958c92993c5050a037d06e4 (diff)
downloadcpython-50a70a083d34305a52fac4f5901bff2ead152d68.zip
cpython-50a70a083d34305a52fac4f5901bff2ead152d68.tar.gz
cpython-50a70a083d34305a52fac4f5901bff2ead152d68.tar.bz2
GH-96678: Fix undefined behavior in ceval.c (#96708)
-rw-r--r--Misc/NEWS.d/next/Core and Builtins/2022-09-09-13-13-27.gh-issue-96678.vMxi9F.rst1
-rw-r--r--Python/ceval.c8
2 files changed, 8 insertions, 1 deletions
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-09-09-13-13-27.gh-issue-96678.vMxi9F.rst b/Misc/NEWS.d/next/Core and Builtins/2022-09-09-13-13-27.gh-issue-96678.vMxi9F.rst
new file mode 100644
index 0000000..575b52b
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-09-09-13-13-27.gh-issue-96678.vMxi9F.rst
@@ -0,0 +1 @@
+Fix case of undefined behavior in ceval.c
diff --git a/Python/ceval.c b/Python/ceval.c
index 7d4543e..20d0e1c 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -5532,7 +5532,13 @@ initialize_locals(PyThreadState *tstate, PyFunctionObject *func,
/* Pack other positional arguments into the *args argument */
if (co->co_flags & CO_VARARGS) {
PyObject *u = NULL;
- u = _PyTuple_FromArraySteal(args + n, argcount - n);
+ if (argcount == n) {
+ u = Py_NewRef(&_Py_SINGLETON(tuple_empty));
+ }
+ else {
+ assert(args != NULL);
+ u = _PyTuple_FromArraySteal(args + n, argcount - n);
+ }
if (u == NULL) {
goto fail_post_positional;
}