fix UBSan failures for DirEntry

picnixz · picnixz · commit f53e72ac5e38 · 2025-02-06T14:32:45.000+01:00
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -15523,9 +15523,12 @@ typedef struct {
 #endif
 } DirEntry;
 
+#define DirEntry_CAST(op)   ((DirEntry *)(op))
+
 static void
-DirEntry_dealloc(DirEntry *entry)
+DirEntry_dealloc(PyObject *op)
 {
+    DirEntry *entry = DirEntry_CAST(op);
     PyTypeObject *tp = Py_TYPE(entry);
     Py_XDECREF(entry->name);
     Py_XDECREF(entry->path);
@@ -15854,8 +15857,9 @@ os_DirEntry_inode_impl(DirEntry *self)
 }
 
 static PyObject *
-DirEntry_repr(DirEntry *self)
+DirEntry_repr(PyObject *op)
 {
+    DirEntry *self = DirEntry_CAST(op);
     return PyUnicode_FromFormat("<DirEntry %R>", self->name);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -15523,9 +15523,12 @@ typedef struct {`
`15523`	`15523`	`#endif`
`15524`	`15524`	`} DirEntry;`
`15525`	`15525`
	`15526`	`+#define DirEntry_CAST(op) ((DirEntry *)(op) AC16 )`
	`15527`	`+`
`15526`	`15528`	`static void`
`15527`		`-DirEntry_dealloc(DirEntry *entry)`
	`15529`	`+DirEntry_dealloc(PyObject *op)`
`15528`	`15530`	`{`
	`15531`	`+ DirEntry *entry = DirEntry_CAST(op);`
`15529`	`15532`	`PyTypeObject *tp = Py_TYPE(entry);`
`15530`	`15533`	`Py_XDECREF(entry->name);`
`15531`	`15534`	`Py_XDECREF(entry->path);`
`@@ -15854,8 +15857,9 @@ os_DirEntry_inode_impl(DirEntry *self)`
`15854`	`15857`	`}`
`15855`	`15858`
`15856`	`15859`	`static PyObject *`
`15857`		`-DirEntry_repr(DirEntry *self)`
	`15860`	`+DirEntry_repr(PyObject *op)`
`15858`	`15861`	`{`
	`15862`	`+ DirEntry *self = DirEntry_CAST(op);`
`15859`	`15863`	`return PyUnicode_FromFormat("<DirEntry %R>", self->name);`
`15860`	`15864`	`}`
`15861`	`15865`