diff options
| author | oehhar <harald.oehlmann@elmicron.de> | 2024-07-18 08:11:17 (GMT) |
|---|---|---|
| committer | oehhar <harald.oehlmann@elmicron.de> | 2024-07-18 08:11:17 (GMT) |
| commit | f18f82b3a73261b2d71dc4ee5c7c19ec87546fc1 (patch) | |
| tree | 4d0d36194e2e1e0df785162b646e5fddcb03bcc9 | |
| parent | f5a920f34101212852f51a1e9ed9fa88ca4dd9f2 (diff) | |
| download | tk-f18f82b3a73261b2d71dc4ee5c7c19ec87546fc1.zip tk-f18f82b3a73261b2d71dc4ee5c7c19ec87546fc1.tar.gz tk-f18f82b3a73261b2d71dc4ee5c7c19ec87546fc1.tar.bz2 | |
Comments changed
| -rw-r--r-- | generic/tkMenu.c | 5 | ||||
| -rw-r--r-- | win/tkWinMenu.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/generic/tkMenu.c b/generic/tkMenu.c index 9ba5a15..fcf49a6 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.c @@ -991,8 +991,9 @@ int TkInvokeMenu( Tcl_Interp *interp, /* The interp that the menu lives in. */ TkMenu *menuPtr, /* The menu we are invoking. */ - /* Must be protected by Tcl_preserve - * against freeing by the caller + /* Must be protected by Tcl_Preserve + * against freeing by the caller. + * Tk Bug [2d3a81c0]. */ int index) /* The zero based index of the item we are * invoking. */ diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 9d9e19c..cd7c4aa 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -1240,10 +1240,6 @@ TkWinHandleMenuEvent( interp = menuPtr->interp; Tcl_Preserve(interp); - /* - * Tk Bug 2d3a81c0: menu may be freed in callback, but menu item is - * preserved. As menu is required to delete menu item later, it segfaults. - */ Tcl_Preserve(menuPtr); code = TkInvokeMenu(interp, menuPtr, mePtr->index); if (code != TCL_OK && code != TCL_CONTINUE && code != TCL_BREAK) { |