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
Next Next commit
fix UBSan failures for TkappObject
  • Loading branch information
@picnixz
picnixz committed Jan 25, 2025
commit cfced14417ff6b9e16ccddfb06c4400fb98d680a
80 changes: 43 additions & 37 deletions Modules/_tkinter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,14 @@ static PyThreadState *tcl_tstate = NULL;
tcl_tstate = tstate; }

#define CHECK_TCL_APPARTMENT \
if (((TkappObject *)self)->threaded && \
((TkappObject *)self)->thread_id != Tcl_GetCurrentThread()) { \
PyErr_SetString(PyExc_RuntimeError, \
"Calling Tcl from different apartment"); \
return 0; \
}
do { \
if (_TkappObject_CAST(self)->threaded && \
_TkappObject_CAST(self)->thread_id != Tcl_GetCurrentThread()) { \
PyErr_SetString(PyExc_RuntimeError, \
"Calling Tcl from different apartment"); \
return 0; \
} \
} while (0)

#ifndef FREECAST
#define FREECAST (char *)
Expand Down Expand Up @@ -328,7 +330,8 @@ typedef struct {
const Tcl_ObjType *PixelType;
} TkappObject;

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


/**** Error Handling ****/
Expand Down Expand Up @@ -1457,7 +1460,7 @@ Tkapp_Call(PyObject *selfptr, PyObject *args)
Tcl_Obj **objv = NULL;
Tcl_Size objc;
PyObject *res = NULL;
TkappObject *self = (TkappObject*)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 @@ -1742,7 +1745,7 @@ var_proc(Tcl_Event *evPtr, int flags)
static PyObject*
var_invoke(EventFunc func, PyObject *selfptr, PyObject *args, int flags)
{
TkappObject *self = (TkappObject*)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 @@ -1800,11 +1803,11 @@ SetVar(TkappObject *self, PyObject *args, int flags)
return NULL;

if (flags & TCL_GLOBAL_ONLY) {
TRACE((TkappObject *)self, ("((ssssO))", "uplevel", "#0", "set",
name1, newValue));
TRACE(self, ("((ssssO))", "uplevel", "#0", "set",
name1, newValue));
}
else {
TRACE((TkappObject *)self, ("((ssO))", "set", name1, newValue));
TRACE(self, ("((ssO))", "set", name1, newValue));
}

ENTER_TCL
Expand All @@ -1827,16 +1830,16 @@ SetVar(TkappObject *self, PyObject *args, int flags)

/* XXX must hold tcl lock already??? */
newval = AsObj(newValue);
if (((TkappObject *)self)->trace) {
if (self->trace) {
if (flags & TCL_GLOBAL_ONLY) {
TRACE((TkappObject *)self, ("((sssNO))", "uplevel", "#0", "set",
PyUnicode_FromFormat("%s(%s)", name1, name2),
newValue));
TRACE(self, ("((sssNO))", "uplevel", "#0", "set",
PyUnicode_FromFormat("%s(%s)", name1, name2),
newValue));
}
else {
TRACE((TkappObject *)self, ("((sNO))", "set",
PyUnicode_FromFormat("%s(%s)", name1, name2),
newValue));
TRACE(self, ("((sNO))", "set",
PyUnicode_FromFormat("%s(%s)", name1, name2),
newValue));
}
}

Expand Down Expand Up @@ -1921,29 +1924,30 @@ UnsetVar(TkappObject *self, PyObject *args, int flags)
int code;
PyObject *res = NULL;

if (!PyArg_ParseTuple(args, "s|s:unsetvar", &name1, &name2))
if (!PyArg_ParseTuple(args, "s|s:unsetvar", &name1, &name2)) {
return NULL;
}

CHECK_STRING_LENGTH(name1);
CHECK_STRING_LENGTH(name2);

if (((TkappObject *)self)->trace) {
if (self->trace) {
if (flags & TCL_GLOBAL_ONLY) {
if (name2) {
TRACE((TkappObject *)self, ("((sssN))", "uplevel", "#0", "unset",
PyUnicode_FromFormat("%s(%s)", name1, name2)));
TRACE(self, ("((sssN))", "uplevel", "#0", "unset",
PyUnicode_FromFormat("%s(%s)", name1, name2)));
}
else {
TRACE((TkappObject *)self, ("((ssss))", "uplevel", "#0", "unset", name1));
TRACE(self, ("((ssss))", "uplevel", "#0", "unset", name1));
}
}
else {
if (name2) {
TRACE((TkappObject *)self, ("((sN))", "unset",
PyUnicode_FromFormat("%s(%s)", name1, name2)));
TRACE(self, ("((sN))", "unset",
PyUnicode_FromFormat("%s(%s)", name1, name2)));
}
else {
TRACE((TkappObject *)self, ("((ss))", "unset", name1));
TRACE(self, ("((ss))", "unset", name1));
}
}
}
Expand Down Expand Up @@ -2958,16 +2962,17 @@ _tkinter_tkapp_loadtk_impl(TkappObject *self)
}

static PyObject *
Tkapp_WantObjects(PyObject *self, PyObject *args)
Tkapp_WantObjects(PyObject *op, PyObject *args)
{

TkappObject *self = _TkappObject_CAST(op);
int wantobjects = -1;
if (!PyArg_ParseTuple(args, "|i:wantobjects", &wantobjects))
if (!PyArg_ParseTuple(args, "|i:wantobjects", &wantobjects)) {
return NULL;
if (wantobjects == -1)
return PyLong_FromLong(((TkappObject*)self)->wantobjects);
((TkappObject*)self)->wantobjects = wantobjects;

}
if (wantobjects == -1) {
return PyLong_FromLong(self->wantobjects);
}
self->wantobjects = wantobjects;
Py_RETURN_NONE;
}

Expand Down Expand Up @@ -3030,14 +3035,15 @@ _tkinter_tkapp_willdispatch_impl(TkappObject *self)
/**** Tkapp Type Methods ****/

static void
Tkapp_Dealloc(PyObject *self)
Tkapp_Dealloc(PyObject *op)
{
PyObject *tp = (PyObject *) Py_TYPE(self);
TkappObject *self = _TkappObject_CAST(op);
PyTypeObject *tp = Py_TYPE(self);
/*CHECK_TCL_APPARTMENT;*/
ENTER_TCL
Tcl_DeleteInterp(Tkapp_Interp(self));
LEAVE_TCL
Py_XDECREF(((TkappObject *)self)->trace);
Py_XDECREF(self->trace);
PyObject_Free(self);
Py_DECREF(tp);
DisableEventHook();
Expand Down