diff options
| author | sebres <sebres@users.sourceforge.net> | 2018-03-14 17:19:23 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2018-03-14 17:19:23 (GMT) |
| commit | 77ab9f868a1aa99f5bdeb1cfb04e146eef54cae8 (patch) | |
| tree | 5725ca0b5f60e2c293b428f32411ba4f4dad47e0 /generic/tclUtil.c | |
| parent | b16ec6f23b5b23b658cac89abc3e04ff754a062a (diff) | |
| parent | 6e7c474da78d60f2d601b3ce3e2e269fd086c9d4 (diff) | |
| download | tcl-77ab9f868a1aa99f5bdeb1cfb04e146eef54cae8.zip tcl-77ab9f868a1aa99f5bdeb1cfb04e146eef54cae8.tar.gz tcl-77ab9f868a1aa99f5bdeb1cfb04e146eef54cae8.tar.bz2 | |
merge 8.5
Diffstat (limited to 'generic/tclUtil.c')
| -rw-r--r-- | generic/tclUtil.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c index 7bbdd95..6eab7b8 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -1901,9 +1901,9 @@ TclTrim( int trimLeft; Tcl_DString bytesBuf, trimBuf; + *trimRight = 0; /* Empty strings -> nothing to do */ if ((numBytes == 0) || (numTrim == 0)) { - *trimRight = 0; return 0; } @@ -1917,8 +1917,8 @@ TclTrim( trimLeft = numBytes; } numBytes -= trimLeft; - *trimRight = 0; - if (numBytes) { + /* have to trim yet (first char was already verified within TrimLeft) */ + if (numBytes > 1) { bytes += trimLeft; *trimRight = TrimRight(bytes, numBytes, trim, numTrim); if (*trimRight > numBytes) { |