summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2018-01-13 13:50:46 (GMT)
committerfvogel <fvogelnew1@free.fr>2018-01-13 13:50:46 (GMT)
commitce4dec3ef66126a40216337b83841a5ed3c57ced (patch)
tree5df8dfa63037a4042eb0825d01af49fc1e5e7b41 /generic
parentd113c70e69fb5934fe86d84b7c03bde2bd9e06d3 (diff)
downloadtk-ce4dec3ef66126a40216337b83841a5ed3c57ced.zip
tk-ce4dec3ef66126a40216337b83841a5ed3c57ced.tar.gz
tk-ce4dec3ef66126a40216337b83841a5ed3c57ced.tar.bz2
Fix [657c389120] and [b4214b4712]: Segfault when destroying menu with checkbutton entry
Diffstat (limited to 'generic')
-rw-r--r--generic/tkMenu.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index d24516f..42ddbd5 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -2495,6 +2495,11 @@ MenuVarProc(
}
menuPtr = mePtr->menuPtr;
+
+ if (menuPtr->menuFlags & MENU_DELETION_PENDING) {
+ return NULL;
+ }
+
name = Tcl_GetString(mePtr->namePtr);
/*