summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen Demeyer <J.Demeyer@UGent.be>2019-06-07 18:01:53 (GMT)
committerGregory P. Smith <greg@krypto.org>2019-06-07 18:01:53 (GMT)
commit1f9531764cc0f8dbca1d8f429d162dc28282f4b4 (patch)
treeacd302dcf1c186930e62313a8a55e8b40a3ef6d2
parente7e5039d6940e41839dcef0433262ff363408dad (diff)
downloadcpython-1f9531764cc0f8dbca1d8f429d162dc28282f4b4.zip
cpython-1f9531764cc0f8dbca1d8f429d162dc28282f4b4.tar.gz
cpython-1f9531764cc0f8dbca1d8f429d162dc28282f4b4.tar.bz2
bpo-37138: fix undefined behaviour with memcpy() on NULL array (GH-13867)
-rw-r--r--Objects/classobject.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/Objects/classobject.c b/Objects/classobject.c
index ffd3f87..2415ed1 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -71,7 +71,11 @@ method_vectorcall(PyObject *method, PyObject *const *args,
}
/* use borrowed references */
newargs[0] = self;
- memcpy(newargs + 1, args, totalargs * sizeof(PyObject *));
+ if (totalargs) { /* bpo-37138: if totalargs == 0, then args may be
+ * NULL and calling memcpy() with a NULL pointer
+ * is undefined behaviour. */
+ memcpy(newargs + 1, args, totalargs * sizeof(PyObject *));
+ }
result = _PyObject_Vectorcall(func, newargs, nargs+1, kwnames);
PyMem_Free(newargs);
}