diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2009-12-29 13:13:17 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2009-12-29 13:13:17 (GMT) |
| commit | e0a526e0845027a3332645c718bb528d55bba601 (patch) | |
| tree | 91433bca2e8f90eb8c420ae39a1d45d8d3eac575 /generic/tclInterp.c | |
| parent | b44d188690574bc4195ab1d381786b89ff54f41a (diff) | |
| download | tcl-e0a526e0845027a3332645c718bb528d55bba601.zip tcl-e0a526e0845027a3332645c718bb528d55bba601.tar.gz tcl-e0a526e0845027a3332645c718bb528d55bba601.tar.bz2 | |
[Bug 2895741]: Make min() and max() supported in safe interpreters.
Diffstat (limited to 'generic/tclInterp.c')
| -rw-r--r-- | generic/tclInterp.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/generic/tclInterp.c b/generic/tclInterp.c index 6ff8cea..e7ad80d 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclInterp.c,v 1.83.2.3 2009/12/28 10:05:22 dkf Exp $ + * RCS: @(#) $Id: tclInterp.c,v 1.83.2.4 2009/12/29 13:13:18 dkf Exp $ */ #include "tclInt.h" @@ -2817,9 +2817,26 @@ Tcl_MakeSafe( { Tcl_Channel chan; /* Channel to remove from safe interpreter. */ Interp *iPtr = (Interp *) interp; + Tcl_Interp *master = ((InterpInfo*) iPtr->interpInfo)->slave.masterInterp; TclHideUnsafeCommands(interp); + if (master != NULL) { + /* + * Alias these function implementations in the slave to those in the + * master; the overall implementations are safe, but they're normally + * defined by init.tcl which is not sourced by safe interpreters. + * Assume these functions all work. [Bug 2895741] + */ + + (void) Tcl_Eval(interp, + "namespace eval ::tcl {namespace eval mathfunc {}}"); + (void) Tcl_CreateAlias(interp, "::tcl::mathfunc::min", master, + "::tcl::mathfunc::min", 0, NULL); + (void) Tcl_CreateAlias(interp, "::tcl::mathfunc::max", master, + "::tcl::mathfunc::max", 0, NULL); + } + iPtr->flags |= SAFE_INTERP; /* |