diff options
| author | dgp@users.sourceforge.net <dgp> | 2011-05-10 16:05:48 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2011-05-10 16:05:48 (GMT) |
| commit | 218ceaadd5f73fb8cda18ef6658390dba3540dc9 (patch) | |
| tree | 1ca2feda250662282a8e77080fef123d9256b839 /generic/tclResult.c | |
| parent | 955b5f01d8001935ee2215cce6575d27d184dc14 (diff) | |
| download | tcl-218ceaadd5f73fb8cda18ef6658390dba3540dc9.zip tcl-218ceaadd5f73fb8cda18ef6658390dba3540dc9.tar.gz tcl-218ceaadd5f73fb8cda18ef6658390dba3540dc9.tar.bz2 | |
Completed patch with mucho comments. Merge 8.5.
Diffstat (limited to 'generic/tclResult.c')
| -rw-r--r-- | generic/tclResult.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/generic/tclResult.c b/generic/tclResult.c index 556903c..7b58d44 100644 --- a/generic/tclResult.c +++ b/generic/tclResult.c @@ -959,12 +959,14 @@ ResetObjResult( TclNewObj(objResultPtr); Tcl_IncrRefCount(objResultPtr); iPtr->objResultPtr = objResultPtr; - } else if (objResultPtr->bytes != tclEmptyStringRep) { - if (objResultPtr->bytes != NULL) { - ckfree((char *) objResultPtr->bytes); + } else { + if (objResultPtr->bytes != tclEmptyStringRep) { + if (objResultPtr->bytes) { + ckfree((char *) objResultPtr->bytes); + } + objResultPtr->bytes = tclEmptyStringRep; + objResultPtr->length = 0; } - objResultPtr->bytes = tclEmptyStringRep; - objResultPtr->length = 0; TclFreeIntRep(objResultPtr); objResultPtr->typePtr = NULL; } |