summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-03-08 15:31:07 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-03-08 15:31:07 (GMT)
commit2bc56d1709caa656983875156b1063a04226824a (patch)
tree64a0d85a3b01858939c4da20d1d3a2be8c3eeb8c
parentb15e299eb27bc31822536712a94d53d68b9f57ae (diff)
parent0bb1a211533009a3be93cfbc8ce96966854507d1 (diff)
downloadtcl-2bc56d1709caa656983875156b1063a04226824a.zip
tcl-2bc56d1709caa656983875156b1063a04226824a.tar.gz
tcl-2bc56d1709caa656983875156b1063a04226824a.tar.bz2
Merge 8.7
-rw-r--r--generic/tclBinary.c2
-rw-r--r--generic/tclExecute.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index dd8bbc0..560d8fe 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -714,7 +714,7 @@ UpdateStringOfByteArray(
for (i = 0; i < length; i++) {
if ((src[i] == 0) || (src[i] > 127)) {
- size++;
+ size += 1U;
}
}
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 47b48fb..197b1e9 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -7889,9 +7889,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 {