summaryrefslogtreecommitdiffstats
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
commit715499f90fbec2dc9ff7ef3e3c9c7ad812986303 (patch)
tree11086f639299f8812b60ca45bb75b67c6e5ccd7d
parent64cca618ce0e26b035db6bb023edaaee01daf32c (diff)
downloadruby-715499f90fbec2dc9ff7ef3e3c9c7ad812986303.tar.gz
ruby-715499f90fbec2dc9ff7ef3e3c9c7ad812986303.tar.xz
ruby-715499f90fbec2dc9ff7ef3e3c9c7ad812986303.zip
* ext/tk/tcltklib.c (ip_delete): fix SEGV when a slave-ip is deleted
on callback. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@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 58f842bba..af07dc18f 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.
+
Mon Jun 26 10:47:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (pipe_open): avoid closing uninitialized file descriptors.
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index e43b98e2c..b9e859125 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -5269,8 +5269,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;