diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkConsole.c | 6 | ||||
| -rw-r--r-- | generic/tkTextBTree.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/generic/tkConsole.c b/generic/tkConsole.c index 8bfbe9b..a6a8cbf 100644 --- a/generic/tkConsole.c +++ b/generic/tkConsole.c @@ -318,7 +318,7 @@ Tk_InitConsoleChannels( * Tk_CreateConsoleWindow -- * * Initialize the console. This code actually creates a new application - * and associated interpreter. This effectivly hides the implementation + * and associated interpreter. This effectively hides the implementation * from the main application. * * Results: @@ -344,9 +344,13 @@ Tk_CreateConsoleWindow( /* Init an interp with Tcl and Tk */ Tcl_Interp *consoleInterp = Tcl_CreateInterp(); if (Tcl_Init(consoleInterp) != TCL_OK) { + Tcl_Obj *result_obj = Tcl_GetObjResult(consoleInterp); + Tcl_SetObjResult(interp, result_obj); goto error; } if (Tk_Init(consoleInterp) != TCL_OK) { + Tcl_Obj *result_obj = Tcl_GetObjResult(consoleInterp); + Tcl_SetObjResult(interp, result_obj); goto error; } diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c index c20c546..81e31dc 100644 --- a/generic/tkTextBTree.c +++ b/generic/tkTextBTree.c @@ -799,6 +799,7 @@ RemovePixelClient( nodePtr->numPixels[treePtr->pixelReferences-1]; } if (treePtr->pixelReferences == 1) { + ckfree(nodePtr->numPixels); nodePtr->numPixels = NULL; } else { nodePtr->numPixels = ckrealloc(nodePtr->numPixels, @@ -1439,6 +1440,7 @@ TkBTreeDeleteIndexRange( prevNodePtr->nextPtr = curNodePtr->nextPtr; } parentPtr->numChildren--; + DeleteSummaries(curNodePtr->summaryPtr); ckfree(curNodePtr->numPixels); ckfree(curNodePtr); curNodePtr = parentPtr; |