diff options
| author | dgp <dgp@users.sourceforge.net> | 2008-03-26 20:08:50 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2008-03-26 20:08:50 (GMT) |
| commit | 7d09862213dc5b81ab51ab699129f8dc0add0693 (patch) | |
| tree | d14af382e18467566d4258f846b4b551a3192987 /generic/tclBasic.c | |
| parent | bf423bcae3ba7be2e916498f9f50ebb1e903d13a (diff) | |
| download | tcl-7d09862213dc5b81ab51ab699129f8dc0add0693.zip tcl-7d09862213dc5b81ab51ab699129f8dc0add0693.tar.gz tcl-7d09862213dc5b81ab51ab699129f8dc0add0693.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'generic/tclBasic.c')
| -rw-r--r-- | generic/tclBasic.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 430f8bc..08208a7 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -14,7 +14,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclBasic.c,v 1.244.2.24 2008/03/10 19:33:12 dgp Exp $ + * RCS: @(#) $Id: tclBasic.c,v 1.244.2.25 2008/03/26 20:08:56 dgp Exp $ */ #include "tclInt.h" @@ -3108,8 +3108,7 @@ OldMathFuncProc( * Convert arguments from Tcl_Obj's to Tcl_Value's. */ - args = (Tcl_Value *) - TclStackAlloc(interp, dataPtr->numArgs * sizeof(Tcl_Value)); + args = (Tcl_Value *) ckalloc(dataPtr->numArgs * sizeof(Tcl_Value)); for (j = 1, k = 0; j < objc; ++j, ++k) { /* TODO: Convert to TclGetNumberFromObj() ? */ @@ -3129,7 +3128,7 @@ OldMathFuncProc( Tcl_SetObjResult(interp, Tcl_NewStringObj( "argument to math function didn't have numeric value",-1)); TclCheckBadOctal(interp, Tcl_GetString(valuePtr)); - TclStackFree(interp, args); + ckfree((char *)args); return TCL_ERROR; } @@ -3161,7 +3160,7 @@ OldMathFuncProc( break; case TCL_INT: if (ExprIntFunc(NULL, interp, 2, &(objv[j-1])) != TCL_OK) { - TclStackFree(interp, args); + ckfree((char *)args); return TCL_ERROR; } valuePtr = Tcl_GetObjResult(interp); @@ -3170,7 +3169,7 @@ OldMathFuncProc( break; case TCL_WIDE_INT: if (ExprWideFunc(NULL, interp, 2, &(objv[j-1])) != TCL_OK) { - TclStackFree(interp, args); + ckfree((char *)args); return TCL_ERROR; } valuePtr = Tcl_GetObjResult(interp); @@ -3186,7 +3185,7 @@ OldMathFuncProc( errno = 0; result = (*dataPtr->proc)(dataPtr->clientData, interp, args, &funcResult); - TclStackFree(interp, args); + ckfree((char *)args); if (result != TCL_OK) { return result; } |