diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-04-25 09:02:00 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-04-25 09:02:00 +0000 |
| commit | 5120d92108eedb70539bd84d310e6e7cc654f1d5 (patch) | |
| tree | 07a9d18b9c4871ad4508942fd0ad0a2fdd63e527 | |
| parent | a1157429688ec922f97963db99bc5913b39a5972 (diff) | |
* ext/tk/tcltklib.c (delete_slaves): maybe increment the reference
count of a NULL Tcl_Obj [ruby-core:07759].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/tk/tcltklib.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Apr 25 18:00:05 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> + + * ext/tk/tcltklib.c (delete_slaves): maybe increment the reference + count of a NULL Tcl_Obj [ruby-core:07759]. + Tue Apr 25 07:55:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/jcode.rb (String::tr_s): should have translated non diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index 03de109b49..e43b98e2c1 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-21" +#define TCLTKLIB_RELEASE_DATE "2006-04-25" #include "ruby.h" #include "rubysig.h" @@ -4285,10 +4285,11 @@ delete_slaves(ip) if (Tcl_ListObjLength((Tcl_Interp*)NULL, slave_list, &len) == TCL_OK) { for(i = 0; i < len; i++) { Tcl_ListObjIndex((Tcl_Interp*)NULL, slave_list, i, &elem); - Tcl_IncrRefCount(elem); if (elem == (Tcl_Obj*)NULL) continue; + Tcl_IncrRefCount(elem); + /* get slave */ /* slave_name = Tcl_GetString(elem); */ slave_name = Tcl_GetStringFromObj(elem, (int*)NULL); |