From 40effa0f8aaae738487ed2384800e626995d776e Mon Sep 17 00:00:00 2001 From: dgp Date: Mon, 13 Apr 2020 02:10:45 +0000 Subject: Cherrypick partial fix. --- generic/tclUtil.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/generic/tclUtil.c b/generic/tclUtil.c index be80610..b3742f7 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -1573,8 +1573,7 @@ TrimRight( const char *trim, /* String of trim characters... */ int numTrim) /* ...and its length in bytes */ { - const char *p = bytes + numBytes; - int pInc; + const char *pp, *p = bytes + numBytes; /* Outer loop: iterate over string to be trimmed */ do { @@ -1582,8 +1581,8 @@ TrimRight( const char *q = trim; int bytesLeft = numTrim; - p = Tcl_UtfPrev(p, bytes); - pInc = TclUtfToUniChar(p, &ch1); + pp = Tcl_UtfPrev(p, bytes); + (void)TclUtfToUniChar(pp, &ch1); /* Inner loop: scan trim string for match to current character */ do { @@ -1600,9 +1599,9 @@ TrimRight( if (bytesLeft == 0) { /* No match; trim task done; *p is last non-trimmed char */ - p += pInc; break; } + p = pp; } while (p > bytes); return numBytes - (p - bytes); -- cgit v0.12