diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-10-03 14:53:32 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-10-03 14:53:32 (GMT) |
commit | a9141cc7056ed9c6778e8fcfb770fcdef7cae3a6 (patch) | |
tree | 09f40aa1bd1ccf9a2e1edc9620015d2bbfef30fa | |
parent | 9fba020c7042f0bea5b33611d06d13c3fb01f6f5 (diff) | |
download | tcl-a9141cc7056ed9c6778e8fcfb770fcdef7cae3a6.zip tcl-a9141cc7056ed9c6778e8fcfb770fcdef7cae3a6.tar.gz tcl-a9141cc7056ed9c6778e8fcfb770fcdef7cae3a6.tar.bz2 |
(cherry-pick): Fix [2bf561854c55a], interp alias to command whose name is the empty string.
-rw-r--r-- | generic/tclInterp.c | 11 | ||||
-rw-r--r-- | tests/interp.test | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/generic/tclInterp.c b/generic/tclInterp.c index 66ce1e0..8a0d653 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -660,14 +660,9 @@ NRInterpCmd( if (masterInterp == NULL) { return TCL_ERROR; } - if (TclGetString(objv[5])[0] == '\0') { - if (objc == 6) { - return AliasDelete(interp, slaveInterp, objv[3]); - } - } else { - return AliasCreate(interp, slaveInterp, masterInterp, objv[3], - objv[5], objc - 6, objv + 6); - } + + return AliasCreate(interp, slaveInterp, masterInterp, objv[3], + objv[5], objc - 6, objv + 6); } goto aliasArgs; } diff --git a/tests/interp.test b/tests/interp.test index f9c1aec..6000ffd 100644 --- a/tests/interp.test +++ b/tests/interp.test @@ -606,6 +606,17 @@ test interp-14.10 {testing interp-alias: error messages} -setup { invoked from within "a 1"} +test interp-14.11 {{interp alias} {target named the empty string} {bug 2bf56185}} -setup { + set interp [interp create [info cmdcount]] + interp eval $interp { + proc {} args {return $args} + } + +} -body { + interp alias {} p1 $interp {} + p1 one two three +} -result {one two three} + # part 15: testing file sharing test interp-15.1 {testing file sharing} { catch {interp delete z} |