summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorPetr Viktorin <encukou@gmail.com>2020-12-29 23:32:07 (GMT)
committerGitHub <noreply@github.com>2020-12-29 23:32:07 (GMT)
commit056c08211b402b4dbc1530a9de9d00ad5309909f (patch)
treecd9e3eb367dde397f56fea413677eebcb4df1b34 /Objects
parent2edfc86f69d8a74f4821974678f664ff94a9dc22 (diff)
downloadcpython-056c08211b402b4dbc1530a9de9d00ad5309909f.zip
cpython-056c08211b402b4dbc1530a9de9d00ad5309909f.tar.gz
cpython-056c08211b402b4dbc1530a9de9d00ad5309909f.tar.bz2
bpo-40052: Fix alignment issue in PyVectorcall_Function() (GH-23999)
``` In file included from /usr/include/python3.8/Python.h:147: In file included from /usr/include/python3.8/abstract.h:837: /usr/include/python3.8/cpython/abstract.h:91:11: error: cast from 'char *' to 'vectorcallfunc *' (aka 'struct _object *(**)(struct _object *, struct _object *const *, unsigned long, struct _object *)') increases required alignment from 1 to 8 [-Werror,-Wcast-align] ptr = (vectorcallfunc*)(((char *)callable) + offset); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. ``` Co-Authored-By: Andreas Schneider <asn@cryptomilk.org> Co-Authored-By: Antoine Pitrou <antoine@python.org>
Diffstat (limited to 'Objects')
-rw-r--r--Objects/call.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Objects/call.c b/Objects/call.c
index 30fa14c..35b06a9 100644
--- a/Objects/call.c
+++ b/Objects/call.c
@@ -205,6 +205,7 @@ PyObject *
PyVectorcall_Call(PyObject *callable, PyObject *tuple, PyObject *kwargs)
{
PyThreadState *tstate = _PyThreadState_GET();
+ vectorcallfunc func;
/* get vectorcallfunc as in PyVectorcall_Function, but without
* the Py_TPFLAGS_HAVE_VECTORCALL check */
@@ -215,7 +216,7 @@ PyVectorcall_Call(PyObject *callable, PyObject *tuple, PyObject *kwargs)
Py_TYPE(callable)->tp_name);
return NULL;
}
- vectorcallfunc func = *(vectorcallfunc *)(((char *)callable) + offset);
+ memcpy(&func, (char *) callable + offset, sizeof(func));
if (func == NULL) {
_PyErr_Format(tstate, PyExc_TypeError,
"'%.200s' object does not support vectorcall",