diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-08 15:27:59 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-08 15:27:59 (GMT) |
| commit | 0bb1a211533009a3be93cfbc8ce96966854507d1 (patch) | |
| tree | fabdb435ae55d6d3b394a7a32bf40ec8ddfae1d2 | |
| parent | 153878c3eb8858310b9031c6c65feae0dcd05722 (diff) | |
| parent | 94033c98698f9311df88190fad45f190b4b829a8 (diff) | |
| download | tcl-0bb1a211533009a3be93cfbc8ce96966854507d1.zip tcl-0bb1a211533009a3be93cfbc8ce96966854507d1.tar.gz tcl-0bb1a211533009a3be93cfbc8ce96966854507d1.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | generic/tclBinary.c | 2 | ||||
| -rw-r--r-- | generic/tclExecute.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c index 4717b05..31e8272 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -824,7 +824,7 @@ UpdateStringOfByteArray( for (i = 0; i < length && size <= INT_MAX; i++) { if ((src[i] == 0) || (src[i] > 127)) { - size++; + size += 1U; } } if (size > INT_MAX) { diff --git a/generic/tclExecute.c b/generic/tclExecute.c index d6aa551..0279218 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -8277,9 +8277,9 @@ ExecuteExtendedBinaryMathOp( && ((size_t)shift < CHAR_BIT*sizeof(Tcl_WideInt))) { w1 = *((const Tcl_WideInt *)ptr1); if (!((w1>0 ? w1 : ~w1) - & -(((Tcl_WideInt)1) + & -(((Tcl_WideUInt)1) << (CHAR_BIT*sizeof(Tcl_WideInt) - 1 - shift)))) { - WIDE_RESULT(w1 << shift); + WIDE_RESULT((Tcl_WideUInt)w1 << shift); } } } else { |