bpo-37138: fix undefined behaviour with memcpy() on NULL array (GH-13867)

(cherry picked from commit 1f9531764c)

Co-authored-by: Jeroen Demeyer <J.Demeyer@UGent.be>
This commit is contained in:
Miss Islington (bot) 2019-06-07 11:25:53 -07:00 committed by GitHub
parent 84d47bd8ad
commit 6e053079ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -71,7 +71,11 @@ method_vectorcall(PyObject *method, PyObject *const *args,
} }
/* use borrowed references */ /* use borrowed references */
newargs[0] = self; newargs[0] = self;
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 *)); memcpy(newargs + 1, args, totalargs * sizeof(PyObject *));
}
result = _PyObject_Vectorcall(func, newargs, nargs+1, kwnames); result = _PyObject_Vectorcall(func, newargs, nargs+1, kwnames);
PyMem_Free(newargs); PyMem_Free(newargs);
} }