diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-11 11:13:43 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-11 11:13:43 +0000 |
| commit | 4d41fb221581725e454596ac10891496b065ddf0 (patch) | |
| tree | 3848d95166373896717881b2a4e8378f6b8a1dec | |
| parent | 19acf638f874ebcab6cb80e8c71ff77a717a8894 (diff) | |
* ext/tcltklib/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV
when exit on Tcl/Tk8.3.x.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8302 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/tcltklib/tcltklib.c | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Mon Apr 11 20:11:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * ext/tcltklib/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV + when exit on Tcl/Tk8.3.x. + Mon Apr 11 15:26:25 2005 NAKAMURA Usaku <usa@ruby-lang.org> * lib/mkmf.rb (configuration): shouldn't output hdrdir twice. diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c index 1a00c7e757..21c9d904cc 100644 --- a/ext/tcltklib/tcltklib.c +++ b/ext/tcltklib/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); |