gh-103295: fix stack overwrite on 32-bit in perf map test harness (#104811)

This commit is contained in:
Carl Meyer 2023-05-23 16:04:31 -06:00 committed by GitHub
parent d56c933992
commit e0b3078705
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -762,19 +762,24 @@ clear_extension(PyObject *self, PyObject *args)
static PyObject *
write_perf_map_entry(PyObject *self, PyObject *args)
{
PyObject *code_addr_v;
const void *code_addr;
unsigned int code_size;
const char *entry_name;
if (!PyArg_ParseTuple(args, "KIs", &code_addr, &code_size, &entry_name))
if (!PyArg_ParseTuple(args, "OIs", &code_addr_v, &code_size, &entry_name))
return NULL;
int ret = PyUnstable_WritePerfMapEntry(code_addr, code_size, entry_name);
if (ret == -1) {
PyErr_SetString(PyExc_OSError, "Failed to write performance map entry");
code_addr = PyLong_AsVoidPtr(code_addr_v);
if (code_addr == NULL) {
return NULL;
}
return Py_BuildValue("i", ret);
int ret = PyUnstable_WritePerfMapEntry(code_addr, code_size, entry_name);
if (ret < 0) {
PyErr_SetFromErrno(PyExc_OSError);
return NULL;
}
return PyLong_FromLong(ret);
}
static PyObject *