gh-111178: fix UBSan failures for PyBytesObject (#131603)

picnixz · web-flow · commit a1205ef524ad · 2025-03-24T11:02:09.000+01:00
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
@@ -2649,15 +2649,16 @@ bytes_hex_impl(PyBytesObject *self, PyObject *sep, int bytes_per_sep)
 }
 
 static PyObject *
-bytes_getnewargs(PyBytesObject *v, PyObject *Py_UNUSED(ignored))
+bytes_getnewargs(PyObject *op, PyObject *Py_UNUSED(dummy))
 {
+    PyBytesObject *v = _PyBytes_CAST(op);
     return Py_BuildValue("(y#)", v->ob_sval, Py_SIZE(v));
 }
 
 
 static PyMethodDef
 bytes_methods[] = {
-    {"__getnewargs__",          (PyCFunction)bytes_getnewargs,  METH_NOARGS},
+    {"__getnewargs__", bytes_getnewargs,  METH_NOARGS},
     BYTES___BYTES___METHODDEF
     {"capitalize", stringlib_capitalize, METH_NOARGS,
      _Py_capitalize__doc__},

Original file line number	Diff line number	Diff line change
`@@ -2649,15 +2649,16 @@ bytes_hex_impl(PyBytesObject self, PyObject sep, int bytes_per_sep)`
`2649`	`2649`	`}`
`2650`	`2650`
`2651`	`2651`	`static PyObject *`
`2652`		`-bytes_getnewargs(PyBytesObject v, PyObject Py_UNUSED(ignored))`
	`2652`	`+bytes_getnewargs(PyObject op, PyObject Py_UNUSED(dummy))`
`2653`	`2653`	`{`
	`2654`	`+ PyBytesObject *v = _PyBytes_CAST(op);`
`2654`	`2655`	`return Py_BuildValue("(y#)", v->ob_sval, Py_SIZE(v));`
`2655`	`2656`	`}`
`2656`	`2657`
`2657`	`2658`
`2658`	`2659`	`static PyMethodDef`
`2659`	`2660`	`bytes_methods[] = {`
`2660`		`- {"__getnewargs__", (PyCFunction)bytes_getnewargs, METH_NOARGS},`
	`2661`	`+ {"__getnewargs__", bytes_getnewargs, METH_NOARGS},`
`2661`	`2662`	`BYTES___BYTES___METHODDEF`
`2662`	`2663`	`{"capitalize", stringlib_capitalize, METH_NOARGS,`
`2663`	`2664`	`_Py_capitalize__doc__},`