summaryrefslogtreecommitdiffstats
path: root/generic/tclTest.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-05 13:55:00 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-05 13:55:00 (GMT)
commit8dac135fc9c8efae2cc3113bc975ab871ff2271f (patch)
treea036d4acb69bc769ac6538fc9b57f9f09cd8e3a6 /generic/tclTest.c
parentd84492f3906d20d05b547a4fa90286fe0a59bb37 (diff)
downloadtcl-8dac135fc9c8efae2cc3113bc975ab871ff2271f.zip
tcl-8dac135fc9c8efae2cc3113bc975ab871ff2271f.tar.gz
tcl-8dac135fc9c8efae2cc3113bc975ab871ff2271f.tar.bz2
Allow additional optional "interp" argument for testinterpresolver command. Not used yet in any test-case.
Protect panic in tclLiteral.c for possible null-pointer access. (cherry-picked from Gustaf Neuman's interpresolver patch). Eliminate some unecessary spacing.
Diffstat (limited to 'generic/tclTest.c')
-rw-r--r--generic/tclTest.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c
index e33d263..b3508f1 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -7449,9 +7449,16 @@ TestInterpResolverCmd(
int idx;
#define RESOLVER_KEY "testInterpResolver"
- if (objc != 2) {
- Tcl_WrongNumArgs(interp, 1, objv, "up|down");
- return TCL_ERROR;
+ if ((objc < 2) || (objc > 3)) {
+ Tcl_WrongNumArgs(interp, 1, objv, "up|down ?interp?");
+ return TCL_ERROR;
+ }
+ if (objc == 3) {
+ interp = Tcl_GetSlave(interp, Tcl_GetString(objv[2]));
+ if (interp == NULL) {
+ Tcl_AppendResult(interp, "provided interpreter not found", NULL);
+ return TCL_ERROR;
+ }
}
if (Tcl_GetIndexFromObj(interp, objv[1], table, "operation", TCL_EXACT,
&idx) != TCL_OK) {