summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2009-01-29 16:08:39 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2009-01-29 16:08:39 (GMT)
commitcc60365fd9005e253d3d786722bc32bd4c6aa66e (patch)
tree44a374fa144f69ab1c3db6d8936da938546c847e
parent4412bccf99e79ac915c6a9df0b7d293750fe1bba (diff)
downloadtcl-cc60365fd9005e253d3d786722bc32bd4c6aa66e.zip
tcl-cc60365fd9005e253d3d786722bc32bd4c6aa66e.tar.gz
tcl-cc60365fd9005e253d3d786722bc32bd4c6aa66e.tar.bz2
Backport fix for [Bug 2519474]
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclNamesp.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f0ff85..466485a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-29 Donal K. Fellows <dkf@users.sf.net>
+
+ * generic/tclNamesp.c (Tcl_FindCommand): [Bug 2519474]: Ensure that
+ the path is not searched when the TCL_NAMESPACE_ONLY flag is given.
+
2009-01-22 Kevin B. Kenny <kennykb@acm.org>
* unix/tcl.m4: Corrected a typo ($(SHLIB_VERSION) should be
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index dab46fc..6368022 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -23,7 +23,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclNamesp.c,v 1.162.2.3 2008/07/21 19:38:19 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclNamesp.c,v 1.162.2.4 2009/01/29 16:08:39 dkf Exp $
*/
#include "tclInt.h"
@@ -2415,7 +2415,8 @@ Tcl_FindCommand(
*/
cmdPtr = NULL;
- if (cxtNsPtr->commandPathLength!=0 && strncmp(name, "::", 2)) {
+ if (cxtNsPtr->commandPathLength!=0 && strncmp(name, "::", 2)
+ && !(flags & TCL_NAMESPACE_ONLY)) {
int i;
Namespace *pathNsPtr, *realNsPtr, *dummyNsPtr;