diff --git a/ChangeLog b/ChangeLog index 94f03c5cbb..85b10bd3d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 11 20:11:06 2005 Hidetoshi NAGAI + + * ext/tk/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV when exit + on Tcl/Tk8.3.x. + Mon Apr 11 15:24:20 2005 NAKAMURA Usaku * lib/mkmf.rb (configuration): shouldn't output hdrdir twice. diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index 1a00c7e757..21c9d904cc 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -4365,7 +4365,7 @@ delete_slaves(ip) ip_finalize(slave); Tcl_DeleteInterp(slave); - Tcl_Release(slave); + /* Tcl_Release(slave); */ } } @@ -4407,7 +4407,7 @@ ip_finalize(ip) delete_slaves(ip); /* delete root widget */ - Tcl_GlobalEval(ip, "destroy ."); + Tcl_GlobalEval(ip, "catch {destroy .}"); /* call finalize-hook-proc */ if (Tcl_GetCommandInfo(ip, finalize_hook_name, &info)) { @@ -4415,8 +4415,8 @@ ip_finalize(ip) Tcl_GlobalEval(ip, finalize_hook_name); } - DUMP1("call cancel aftern scripts"); - Tcl_GlobalEval(ip, "foreach id [after info] {after cancel $id}"); + DUMP1("cancel after scripts"); + Tcl_GlobalEval(ip, "catch {foreach id [after info] {after cancel $id}}"); Tcl_Release(ip);