summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-04-21 06:22:43 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-04-21 06:22:43 +0000
commit10de170b0dd74c881fa83fac6150bbcb40fea264 (patch)
treecc2b06fbf7938523deaa8d46a8fe9bce2d039360
parent30bf2d5c535999357302966a6d846eb990025274 (diff)
downloadruby-10de170b0dd74c881fa83fac6150bbcb40fea264.tar.gz
ruby-10de170b0dd74c881fa83fac6150bbcb40fea264.tar.xz
ruby-10de170b0dd74c881fa83fac6150bbcb40fea264.zip
* ext/tk/tcltklib.c (lib_eventloop_ensure): refer freed pointer
[ruby-core:07744] and memory leak. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/tk/tcltklib.c8
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1bce06c54..9278ba9b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 21 15:19:13 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * ext/tk/tcltklib.c (lib_eventloop_ensure): refer freed pointer
+ [ruby-core:07744] and memory leak.
+
Fri Apr 21 12:14:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/socket/socket.c: document update patch from Sam Roberts
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index ebc2ac5d7..03de109b4 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -4,7 +4,7 @@
* Oct. 24, 1997 Y. Matsumoto
*/
-#define TCLTKLIB_RELEASE_DATE "2006-04-18"
+#define TCLTKLIB_RELEASE_DATE "2006-04-21"
#include "ruby.h"
#include "rubysig.h"
@@ -1696,6 +1696,8 @@ lib_eventloop_ensure(args)
rb_thread_critical = ptr->thr_crit_bup;
+ free(ptr);
+
return Qnil;
}
@@ -1724,10 +1726,10 @@ lib_eventloop_ensure(args)
}
}
- free(ptr);
-
rb_thread_critical = ptr->thr_crit_bup;
+ free(ptr);
+
DUMP2("finish current eventloop %lx", current_evloop);
return Qnil;
}