diff options
| author | donal.k.fellows@manchester.ac.uk <dkf> | 2013-01-03 14:07:24 (GMT) |
|---|---|---|
| committer | donal.k.fellows@manchester.ac.uk <dkf> | 2013-01-03 14:07:24 (GMT) |
| commit | 830a18d4d8114998c98667bceaa37e2f084503ff (patch) | |
| tree | 54dad526f36acf29f43fabc0987a1a640026950d /generic/tclUtil.c | |
| parent | bc87bbb4d9b94ea5b2716adde55d18f632b82768 (diff) | |
| parent | ec27f9439e22b89d891eda22d06f2840aafbcb10 (diff) | |
| download | tcl-830a18d4d8114998c98667bceaa37e2f084503ff.zip tcl-830a18d4d8114998c98667bceaa37e2f084503ff.tar.gz tcl-830a18d4d8114998c98667bceaa37e2f084503ff.tar.bz2 | |
merge main dev branch
Diffstat (limited to 'generic/tclUtil.c')
| -rw-r--r-- | generic/tclUtil.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c index 13e54ec..ddf067b 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -2927,14 +2927,16 @@ TclDStringToObj( { Tcl_Obj *result; - if (dsPtr->length == 0) { - TclNewObj(result); - } else if (dsPtr->string == dsPtr->staticSpace) { - /* - * Static buffer, so must copy. - */ - - TclNewStringObj(result, dsPtr->string, dsPtr->length); + if (dsPtr->string == dsPtr->staticSpace) { + if (dsPtr->length == 0) { + TclNewObj(result); + } else { + /* + * Static buffer, so must copy. + */ + + TclNewStringObj(result, dsPtr->string, dsPtr->length); + } } else { /* * Dynamic buffer, so transfer ownership and reset. |