diff options
| -rw-r--r-- | generic/tclExecute.c | 8 | ||||
| -rw-r--r-- | generic/tclInt.h | 4 | ||||
| -rw-r--r-- | generic/tclNamesp.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 786fffb..47c0618 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -855,8 +855,8 @@ TclCreateExecEnv( * [sizeof(Tcl_Obj*)] */ { ExecEnv *eePtr = (ExecEnv *)ckalloc(sizeof(ExecEnv)); - ExecStack *esPtr = (ExecStack *)ckalloc(sizeof(ExecStack) - + (size_t) (size-1) * sizeof(Tcl_Obj *)); + ExecStack *esPtr = (ExecStack *)ckalloc(offsetof(ExecStack, stackWords) + + size * sizeof(Tcl_Obj *)); eePtr->execStackPtr = esPtr; TclNewIntObj(eePtr->constants[0], 0); @@ -1121,7 +1121,7 @@ GrowEvaluationStack( newElems = needed; #endif - newBytes = sizeof(ExecStack) + (newElems-1) * sizeof(Tcl_Obj *); + newBytes = offsetof(ExecStack, stackWords) + newElems * sizeof(Tcl_Obj *); oldPtr = esPtr; esPtr = (ExecStack *)ckalloc(newBytes); @@ -4529,7 +4529,7 @@ TEBCresume( origCmd = TclGetOriginalCommand(cmd); if (origCmd == NULL) { origCmd = cmd; - } + } TclNewObj(objResultPtr); Tcl_GetCommandFullName(interp, origCmd, objResultPtr); diff --git a/generic/tclInt.h b/generic/tclInt.h index d79937f..1d380f9 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -1461,7 +1461,7 @@ typedef struct ExecStack { Tcl_Obj **markerPtr; Tcl_Obj **endPtr; Tcl_Obj **tosPtr; - Tcl_Obj *stackWords[1]; + Tcl_Obj *stackWords[TCLFLEXARRAY]; } ExecStack; /* @@ -4986,7 +4986,7 @@ MODULE_SCOPE Tcl_PackageInitProc Procbodytest_SafeInit; } \ (location) = (cmdPtr); \ } while (0) - + #define TclRoutineHasName(cmdPtr) \ ((cmdPtr)->hPtr != NULL) diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c index 673acb0..8e138d0 100644 --- a/generic/tclNamesp.c +++ b/generic/tclNamesp.c @@ -1770,7 +1770,7 @@ DoImport( TclInvokeImportedCmd, InvokeImportedNRCmd, dataPtr, DeleteImportedCmd); dataPtr->realCmdPtr = cmdPtr; - /* corresponding decrement is in DeleteImportedCmd */ + /* corresponding decrement is in DeleteImportedCmd */ cmdPtr->refCount++; dataPtr->selfPtr = (Command *) importedCmd; dataPtr->selfPtr->compileProc = cmdPtr->compileProc; @@ -3906,7 +3906,7 @@ NamespaceOriginCmd( origCmd = TclGetOriginalCommand(cmd); if (origCmd == NULL) { origCmd = cmd; - } + } TclNewObj(resultPtr); Tcl_GetCommandFullName(interp, origCmd, resultPtr); if (TclCheckEmptyString(resultPtr) == TCL_EMPTYSTRING_YES ) { |