summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrmax <rmax>2005-12-12 11:28:22 (GMT)
committerrmax <rmax>2005-12-12 11:28:22 (GMT)
commit7a116443a870099b88001b8017e2100cc8ee0937 (patch)
treedf0dd8c2d195a2222f37a8b228cc6b19f6106260
parent935e1e7bff4e2328bdf256ef524c4a6a3aa9947e (diff)
downloadtcl-7a116443a870099b88001b8017e2100cc8ee0937.zip
tcl-7a116443a870099b88001b8017e2100cc8ee0937.tar.gz
tcl-7a116443a870099b88001b8017e2100cc8ee0937.tar.bz2
* generic/tclExecute.c (ExprAbsFunc): fixed the abs(MIN_INT) case
so that it doesn't break on compilers that don't assume integers to wrap around (e.g. gcc-4.1.0).
-rw-r--r--ChangeLog6
-rw-r--r--generic/tclExecute.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c574b2..fd1b850 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-12 Reinhard Max <max@suse.de>
+
+ * generic/tclExecute.c (ExprAbsFunc): fixed the abs(MIN_INT) case
+ so that it doesn't break on compilers that don't assume integers
+ to wrap around (e.g. gcc-4.1.0).
+
2005-12-09 Donal K. Fellows <donal.k.fellows@manchester.ac.uk>
* tests/lsearch.test (lsearch-10.8..10): If the -start is off the end,
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index c238a98..34e4ec1 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclExecute.c,v 1.94.2.17 2005/10/28 03:26:32 mdejong Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.94.2.18 2005/12/12 11:28:22 rmax Exp $
*/
#include "tclInt.h"
@@ -5074,8 +5074,7 @@ ExprAbsFunc(interp, eePtr, clientData)
if (valuePtr->typePtr == &tclIntType) {
i = valuePtr->internalRep.longValue;
if (i < 0) {
- iResult = -i;
- if (iResult < 0) {
+ if (i == LONG_MIN) {
#ifdef TCL_WIDE_INT_IS_LONG
Tcl_SetObjResult(interp, Tcl_NewStringObj(
"integer value too large to represent", -1));
@@ -5094,6 +5093,7 @@ ExprAbsFunc(interp, eePtr, clientData)
#endif
}
+ iResult = -i;
} else {
iResult = i;
}