summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2004-06-29 09:34:41 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2004-06-29 09:34:41 (GMT)
commit6e1fd820cba4c1c418981963fa2fe62ea112b69d (patch)
tree875c253c143b3b83a196a36ef0f906aff199859d
parent5e7d6ef8fae9debf78ec144defd6c447fef59192 (diff)
downloadtcl-6e1fd820cba4c1c418981963fa2fe62ea112b69d.zip
tcl-6e1fd820cba4c1c418981963fa2fe62ea112b69d.tar.gz
tcl-6e1fd820cba4c1c418981963fa2fe62ea112b69d.tar.bz2
Fix [Bug 981733]; bizarre resolver brokenness strikes again!
-rw-r--r--ChangeLog5
-rw-r--r--library/safe.tcl8
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 95ef7f6..4e310e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-29 Donal K. Fellows <donal.k.fellows@man.ac.uk>
+
+ * library/safe.tcl: Make sure that the temporary variable is
+ local to the namespace and not inadvertently global. [Bug 981733]
+
2004-06-24 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* tests/unixNotfy.test: Modified constraints so that testing with
diff --git a/library/safe.tcl b/library/safe.tcl
index 1027efe..60687bf 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.13 2004/03/17 18:14:14 das Exp $
+# RCS: @(#) $Id: safe.tcl,v 1.14 2004/06/29 09:34:44 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]]