summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-11-04 14:40:54 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-11-04 14:40:54 (GMT)
commitb94e244508854aab209a3aa83cc0f559f974f6c9 (patch)
tree3f4fd384aa651b0b58da2de05866a89565aca1d1
parent9483c91f1b6ce1bb5f1cd5314507f42737e5899e (diff)
parent09077eceec17bc1586d2aefe2c38b857425045e6 (diff)
downloadtcl-b94e244508854aab209a3aa83cc0f559f974f6c9.zip
tcl-b94e244508854aab209a3aa83cc0f559f974f6c9.tar.gz
tcl-b94e244508854aab209a3aa83cc0f559f974f6c9.tar.bz2
[824752f10e] More robust, portable check for integer overflow.
-rw-r--r--generic/tclListObj.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 2929423..344d0fd 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -897,11 +897,8 @@ Tcl_ListObjReplace(
}
if (count < 0) {
count = 0;
- } else if (numElems < first+count || first+count < 0) {
- /*
- * The 'first+count < 0' condition here guards agains integer
- * overflow in determining 'first+count'.
- */
+ } else if (first > INT_MAX - count /* Handle integer overflow */
+ || numElems < first+count) {
count = numElems - first;
}