Skip to content

gh-111178: fix UBSan failures in Modules/_tkinter.c #129795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
encukou merged 10 commits into from
Feb 26, 2025
Merged

gh-111178: fix UBSan failures in Modules/_tkinter.c #129795

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cfced14
fix UBSan failures for `TkappObject`
picnixz Jan 25, 2025
d2b723d
fix UBSan failures for `PyTclObject`
picnixz Jan 25, 2025
8c0e55e
fix UBSan failures for `TkttObject`
picnixz Jan 25, 2025
5b6a755
Merge remote-tracking branch 'upstream/main' into fix/ubsan/tkinter-1…
picnixz Feb 7, 2025
9662528
Do Do not use `_` + capital letter in new code as it is also UB.
picnixz Feb 8, 2025
6df44b6
fix compilation
picnixz Feb 8, 2025
49fc5c6
Merge branch 'main' into fix/ubsan/tkinter-111178
encukou Feb 18, 2025
08efc4c
remove unused `TkttObject_FAST_CAST` macro
picnixz Feb 25, 2025
f5f4efc
remove redundant macros and improve `CHECK_TCL_APPARTMENT`
picnixz Feb 25, 2025
5f2287c
implement CHECK_TCL_APPARTMENT as a static inline function
picnixz Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Do Do not use _ + capital letter in new code as it is also UB.
  • Loading branch information
@picnixz
picnixz committed Feb 8, 2025
commit 96625280999272abeb08334dceaa151e476b38b5
38 changes: 19 additions & 19 deletions Modules/_tkinter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ typedef struct {
const Tcl_ObjType *PixelType;
} TkappObject;

#define _TkappObject_CAST(op) ((TkappObject *)(op))
#define Tkapp_Interp(v) (_TkappObject_CAST(v)->interp)
#define TkappObject_CAST(op) ((TkappObject *)(op))
#define Tkapp_Interp(v) (TkappObject_CAST(v)->interp)


/**** Error Handling ****/
Expand Down Expand Up @@ -766,7 +766,7 @@ typedef struct {
PyObject *string; /* This cannot cause cycles. */
} PyTclObject;

#define _PyTclObject_CAST(op) ((PyTclObject *)(op))
#define PyTclObject_CAST(op) ((PyTclObject *)(op))

static PyObject *PyTclObject_Type;
#define PyTclObject_Check(v) Py_IS_TYPE(v, (PyTypeObject *) PyTclObject_Type)
Expand All @@ -787,7 +787,7 @@ newPyTclObject(Tcl_Obj *arg)
static void
PyTclObject_dealloc(PyObject *_self)
{
PyTclObject *self = _PyTclObject_CAST(_self);
PyTclObject *self = PyTclObject_CAST(_self);
PyObject *tp = (PyObject *) Py_TYPE(self);
Tcl_DecrRefCount(self->value);
Py_XDECREF(self->string);
Expand All @@ -802,7 +802,7 @@ PyDoc_STRVAR(PyTclObject_string__doc__,
static PyObject *
PyTclObject_string(PyObject *_self, void *Py_UNUSED(closure))
{
PyTclObject *self = _PyTclObject_CAST(_self);
PyTclObject *self = PyTclObject_CAST(_self);
if (!self->string) {
self->string = unicodeFromTclObj(NULL, self->value);
if (!self->string)
Expand All @@ -814,7 +814,7 @@ PyTclObject_string(PyObject *_self, void *Py_UNUSED(closure))
static PyObject *
PyTclObject_str(PyObject *_self)
{
PyTclObject *self = _PyTclObject_CAST(_self);
PyTclObject *self = PyTclObject_CAST(_self);
if (self->string) {
return Py_NewRef(self->string);
}
Expand All @@ -825,7 +825,7 @@ PyTclObject_str(PyObject *_self)
static PyObject *
PyTclObject_repr(PyObject *_self)
{
PyTclObject *self = _PyTclObject_CAST(_self);
PyTclObject *self = PyTclObject_CAST(_self);
PyObject *repr, *str = PyTclObject_str(_self);
if (str == NULL)
return NULL;
Expand Down Expand Up @@ -869,7 +869,7 @@ PyDoc_STRVAR(get_typename__doc__, "name of the Tcl type");
static PyObject*
get_typename(PyObject *self, void *Py_UNUSED(closure))
{
PyTclObject *obj = _PyTclObject_CAST(self);
PyTclObject *obj = PyTclObject_CAST(self);
return unicodeFromTclString(obj->value->typePtr->name);
}

Expand Down Expand Up @@ -1466,7 +1466,7 @@ Tkapp_Call(PyObject *selfptr, PyObject *args)
Tcl_Obj **objv = NULL;
Tcl_Size objc;
PyObject *res = NULL;
TkappObject *self = _TkappObject_CAST(selfptr);
TkappObject *self = TkappObject_CAST(selfptr);
int flags = TCL_EVAL_DIRECT | TCL_EVAL_GLOBAL;

/* If args is a single tuple, replace with contents of tuple */
Expand Down Expand Up @@ -1751,7 +1751,7 @@ var_proc(Tcl_Event *evPtr, int flags)
static PyObject*
var_invoke(EventFunc func, PyObject *selfptr, PyObject *args, int flags)
{
TkappObject *self = _TkappObject_CAST(selfptr);
TkappObject *self = TkappObject_CAST(selfptr);
if (self->threaded && self->thread_id != Tcl_GetCurrentThread()) {
VarEvent *ev;
// init 'res' and 'exc' to make static analyzers happy
Expand Down Expand Up @@ -2689,7 +2689,7 @@ _tkinter_tkapp_deletefilehandler(TkappObject *self, PyObject *file)
/**** Tktt Object (timer token) ****/

static PyObject *Tktt_Type;
#define _TkttObject_Check(op) \
#define TkttObject_Check(op) \
PyObject_TypeCheck((op), (PyTypeObject *)Tktt_Type)

typedef struct {
Expand All @@ -2698,9 +2698,9 @@ typedef struct {
PyObject *func;
} TkttObject;

#define _TkttObject_FAST_CAST(op) ((TkttObject *)(op))
#define _TkttObject_CAST(op) (assert(_TkttObject_Check(op)), \
_TkttObject_FAST_CAST(op))
#define TkttObject_FAST_CAST(op) ((TkttObject *)(op))
#define TkttObject_CAST(op) \
(assert(TkttObject_Check(op)), TkttObject_FAST_CAST(op))

/*[clinic input]
_tkinter.tktimertoken.deletetimerhandler
Expand Down Expand Up @@ -2746,7 +2746,7 @@ Tktt_New(PyObject *func)
static void
Tktt_Dealloc(PyObject *self)
{
TkttObject *v = _TkttObject_CAST(self);
TkttObject *v = TkttObject_CAST(self);
PyObject *func = v->func;
PyObject *tp = (PyObject *) Py_TYPE(self);

Expand All @@ -2759,7 +2759,7 @@ Tktt_Dealloc(PyObject *self)
static PyObject *
Tktt_Repr(PyObject *self)
{
TkttObject *v = _TkttObject_CAST(self);
TkttObject *v = TkttObject_CAST(self);
return PyUnicode_FromFormat("<tktimertoken at %p%s>",
v,
v->func == NULL ? ", handler deleted" : "");
Expand All @@ -2770,7 +2770,7 @@ Tktt_Repr(PyObject *self)
static void
TimerHandler(ClientData clientData)
{
TkttObject *v = _TkttObject_CAST(clientData);
TkttObject *v = TkttObject_CAST(clientData);
PyObject *func = v->func;
PyObject *res;

Expand Down Expand Up @@ -2976,7 +2976,7 @@ _tkinter_tkapp_loadtk_impl(TkappObject *self)
static PyObject *
Tkapp_WantObjects(PyObject *op, PyObject *args)
{
TkappObject *self = _TkappObject_CAST(op);
TkappObject *self = TkappObject_CAST(op);
int wantobjects = -1;
if (!PyArg_ParseTuple(args, "|i:wantobjects", &wantobjects)) {
return NULL;
Expand Down Expand Up @@ -3049,7 +3049,7 @@ _tkinter_tkapp_willdispatch_impl(TkappObject *self)
static void
Tkapp_Dealloc(PyObject *op)
{
TkappObject *self = _TkappObject_CAST(op);
TkappObject *self = TkappObject_CAST(op);
PyTypeObject *tp = Py_TYPE(self);
/*CHECK_TCL_APPARTMENT;*/
ENTER_TCL
Expand Down