summaryrefslogtreecommitdiffstats
path: root/generic/tclNamesp.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-03-09 14:56:37 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-03-09 14:56:37 (GMT)
commit69bacba44cfb85243b44d53ae35d8ed89527767d (patch)
tree7462dd2f8b6a7545c9a33c400f01d2a277ac4f29 /generic/tclNamesp.c
parentb839cc7b23cc44e72ee1a857ba26249b6b2370fb (diff)
downloadtcl-69bacba44cfb85243b44d53ae35d8ed89527767d.zip
tcl-69bacba44cfb85243b44d53ae35d8ed89527767d.tar.gz
tcl-69bacba44cfb85243b44d53ae35d8ed89527767d.tar.bz2
* generic/tclNamesp.c: Tighten the detector of nested [namespace code] bug_3202171
* tests/namespace.test: quoting that the quoted scriptsfunction properly even in a namespace that contains a custom "namespace" command. [Bug 3202171]
Diffstat (limited to 'generic/tclNamesp.c')
-rw-r--r--generic/tclNamesp.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 1747c99..16f14e9 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -3007,7 +3007,7 @@ NamespaceCodeCmd(
{
Namespace *currNsPtr;
Tcl_Obj *listPtr, *objPtr;
- register char *arg, *p;
+ register char *arg;
int length;
if (objc != 3) {
@@ -3017,21 +3017,17 @@ NamespaceCodeCmd(
/*
* If "arg" is already a scoped value, then return it directly.
+ * Take care to only check for scoping in precisely the style that
+ * [::namespace code] generates it. Anything more forgiving can have
+ * the effect of failing in namespaces that contain their own custom
+ " "namespace" command. [Bug 3202171].
*/
arg = TclGetStringFromObj(objv[2], &length);
- while (*arg == ':') {
- arg++;
- length--;
- }
- if (*arg=='n' && length>17 && strncmp(arg, "namespace", 9)==0) {
- for (p=arg+9 ; isspace(UCHAR(*p)) ; p++) {
- /* empty body: skip over whitespace */
- }
- if (*p=='i' && (p+7 <= arg+length) && strncmp(p, "inscope", 7)==0) {
- Tcl_SetObjResult(interp, objv[2]);
- return TCL_OK;
- }
+ if (*arg==':' && length > 20
+ && strncmp(arg, "::namespace inscope ", 20) == 0) {
+ Tcl_SetObjResult(interp, objv[2]);
+ return TCL_OK;
}
/*