summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2018-01-19 20:39:30 (GMT)
committerfvogel <fvogelnew1@free.fr>2018-01-19 20:39:30 (GMT)
commitc9da1ae24b322a43894506dfbe36d4949d9ba720 (patch)
tree34424f271e9d1e0b6fd2b22ba1fc6344a8cc6760
parent33a0e9961a6f4d99e529a7296511263ad8423c9e (diff)
parentce4dec3ef66126a40216337b83841a5ed3c57ced (diff)
downloadtk-c9da1ae24b322a43894506dfbe36d4949d9ba720.zip
tk-c9da1ae24b322a43894506dfbe36d4949d9ba720.tar.gz
tk-c9da1ae24b322a43894506dfbe36d4949d9ba720.tar.bz2
Fix [657c389120] and [b4214b4712]: Segfault when destroying menu with checkbutton entry
-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);
/*