summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-26 09:41:34 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-26 09:41:34 +0000
commit6fa7d6cb014334082f020e57c248de6ea4a30b94 (patch)
treef4fda42cf30fcaa525aa4e11f54a1e23f45f7ea8
parent439600afbd818eebde13580a7cf9f9152c3cbe4a (diff)
* ext/tk/tcltklib.c (ip_delete): fix SEGV when a slave-ip is deleted
on callback. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/tk/tcltklib.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bec3edde74..d9581687a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 26 18:37:44 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/tcltklib.c (ip_delete): fix SEGV when a slave-ip is
+ deleted on callback.
+
Sun Jun 25 23:02:12 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, mkconfig.rb: catch-up for latest autoconf.
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index e9b553f35c..0505dfd1a5 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -5265,8 +5265,6 @@ ip_delete(self)
Tcl_DeleteInterp(ptr->ip);
Tcl_Release(ptr->ip);
- ptr->ip = (Tcl_Interp*)NULL;
-
rb_thread_critical = thr_crit_bup;
return Qnil;