From 427b3847a04534c1a0703535fe306878274bcf20 Mon Sep 17 00:00:00 2001 From: dkf Date: Tue, 29 Jun 2004 09:38:59 +0000 Subject: Fix [Bug 981733]; bizarre resolver brokenness strikes again! --- ChangeLog | 5 +++++ library/safe.tcl | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 626e49c..2cc050c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-06-29 Donal K. Fellows + + * library/safe.tcl: Make sure that the temporary variable is + local to the namespace and not inadvertently global. [Bug 981733] + 2004-06-22 Zoran Vasiljevic * generic/tclEvent.c: diff --git a/library/safe.tcl b/library/safe.tcl index a5252d8..f34fea2 100644 --- a/library/safe.tcl +++ b/library/safe.tcl @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: safe.tcl,v 1.9.2.1 2003/07/16 22:49:31 hobbs Exp $ +# RCS: @(#) $Id: safe.tcl,v 1.9.2.2 2004/06/29 09:39:01 dkf Exp $ # # The implementation is based on namespaces. These naming conventions @@ -37,6 +37,10 @@ namespace eval ::safe { # #### + # Make sure that our temporary variable is local to this + # namespace. [Bug 981733] + variable temp + # Share the descriptions set temp [::tcl::OptKeyRegister { {-accessPath -list {} "access path for the slave"} @@ -321,7 +325,7 @@ namespace eval ::safe { # determine and store the access path if empty if {[string equal "" $access_path]} { - set access_path [uplevel #0 set auto_path] + set access_path [uplevel \#0 set auto_path] # Make sure that tcl_library is in auto_path # and at the first position (needed by setAccessPath) set where [lsearch -exact $access_path [info library]] -- cgit v0.12