Commite0b3078

authored

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

1 parentd56c933 commite0b3078Copy full SHA for e0b3078

File tree

-4

lines changed

-4

lines changed

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -762,19 +762,24 @@ clear_extension(PyObject self, PyObject args)`
`762`	`762`	`staticPyObject*`
`763`	`763`	`write_perf_map_entry(PyObjectself,PyObjectargs)`
`764`	`764`	`{`
	`765`	`+PyObject*code_addr_v;`
`765`	`766`	`constvoid*code_addr;`
`766`	`767`	`unsignedintcode_size;`
`767`	`768`	`constchar*entry_name;`
`768`	`769`
`769`		`-if (!PyArg_ParseTuple(args,"KIs",&code_addr,&code_size,&entry_name))`
	`770`	`+if (!PyArg_ParseTuple(args,"OIs",&code_addr_v,&code_size,&entry_name))`
`770`	`771`	`returnNULL;`
	`772`	`+code_addr=PyLong_AsVoidPtr(code_addr_v);`
	`773`	`+if (code_addr==NULL) {`
	`774`	`+returnNULL;`
	`775`	`+ }`
`771`	`776`
`772`	`777`	`intret=PyUnstable_WritePerfMapEntry(code_addr,code_size,entry_name);`
`773`		`-if (ret==-1) {`
`774`		`-PyErr_SetString(PyExc_OSError,"Failed to write performance map entry");`
	`778`	`+if (ret<0) {`
	`779`	`+PyErr_SetFromErrno(PyExc_OSError);`
`775`	`780`	`returnNULL;`
`776`	`781`	`}`
`777`		`-returnPy_BuildValue("i",ret);`
	`782`	`+returnPyLong_FromLong(ret);`
`778`	`783`	`}`
`779`	`784`
`780`	`785`	`staticPyObject*`

Comments

(0)