From 129d05ae8d727952c01a6de74682630f3dc009ba Mon Sep 17 00:00:00 2001 From: eban Date: Thu, 10 Oct 2002 08:30:52 +0000 Subject: * ext/tcltklib/stubs.c (ruby_tcltk_stubs): fix memory leak. [ruby-dev:18478] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/tcltklib/stubs.c | 11 ++++++----- version.h | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 60dd8d1f13..e572529d82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 10 17:26:12 2002 WATANABE Hirofumi + + * ext/tcltklib/stubs.c (ruby_tcltk_stubs): fix memory leak. + [ruby-dev:18478] + Thu Oct 10 15:20:18 2002 Nobuyoshi Nakada * lib/weakref.rb (WeakRef::@@final): use Hash#delete. diff --git a/ext/tcltklib/stubs.c b/ext/tcltklib/stubs.c index 0c9e9872d7..9709aca3fb 100644 --- a/ext/tcltklib/stubs.c +++ b/ext/tcltklib/stubs.c @@ -34,8 +34,8 @@ ruby_tcltk_stubs() int (*p_Tk_Init) _((Tcl_Interp *)); Tcl_Interp *tcl_ip; int n; - char *ruby_tcl_dll; - char *ruby_tk_dll; + char *ruby_tcl_dll = 0; + char *ruby_tk_dll = 0; char tcl_name[20]; char tk_name[20]; @@ -47,9 +47,6 @@ ruby_tcltk_stubs() if (ruby_tcl_dll && ruby_tk_dll) { tcl_dll = (DL_HANDLE)DL_OPEN(ruby_tcl_dll); tk_dll = (DL_HANDLE)DL_OPEN(ruby_tk_dll); -#if defined NT - ruby_xfree(ruby_tcl_dll); -#endif } else { snprintf(tcl_name, sizeof tcl_name, TCL_NAME, DLEXT); snprintf(tk_name, sizeof tk_name, TK_NAME, DLEXT); @@ -64,6 +61,10 @@ ruby_tcltk_stubs() } } +#if defined NT + if (ruby_tcl_dll) ruby_xfree(ruby_tcl_dll); +#endif + if (!tcl_dll || !tk_dll) return -1; diff --git a/version.h b/version.h index e4568d5c39..25a59098d7 100644 --- a/version.h +++ b/version.h @@ -1,4 +1,4 @@ #define RUBY_VERSION "1.7.3" -#define RUBY_RELEASE_DATE "2002-10-09" +#define RUBY_RELEASE_DATE "2002-10-10" #define RUBY_VERSION_CODE 173 -#define RUBY_RELEASE_CODE 20021009 +#define RUBY_RELEASE_CODE 20021010 -- cgit v1.2.3