From cdc9f81558283eb435d610b63e854a0b52af8742 Mon Sep 17 00:00:00 2001 From: nagai Date: Tue, 25 Apr 2006 09:02:00 +0000 Subject: * ext/tk/tcltklib.c (delete_slaves): maybe increment the reference count of a NULL Tcl_Obj [ruby-core:07759]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/tk/tcltklib.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75916f178..930963b2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Apr 25 18:00:05 2006 Hidetoshi NAGAI + + * ext/tk/tcltklib.c (delete_slaves): maybe increment the reference + count of a NULL Tcl_Obj [ruby-core:07759]. + Fri Apr 21 15:19:13 2006 Hidetoshi NAGAI * ext/tk/tcltklib.c (lib_eventloop_ensure): refer freed pointer diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index 03de109b4..e43b98e2c 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); -- cgit