summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2004-05-25 00:07:53 (GMT)
committerhobbs <hobbs>2004-05-25 00:07:53 (GMT)
commit40784eec1443aeb03b936a7e779dfeb77faa2a3f (patch)
treedf19cabf7b9c5d444d9ff183f407bda447693fdf
parentef7d2e991dce0522cc493243c5bd0d91df5fc06a (diff)
downloadtcl-40784eec1443aeb03b936a7e779dfeb77faa2a3f.zip
tcl-40784eec1443aeb03b936a7e779dfeb77faa2a3f.tar.gz
tcl-40784eec1443aeb03b936a7e779dfeb77faa2a3f.tar.bz2
* generic/tclExecute.c (VerifyExprObjType): use GET_WIDE_OR_INT to
properly have tclIntType used for smaller values. This corrects TclX bug 896727 and any other 3rd party extension that created math functions but was not yet WIDE_INT aware in them.
-rw-r--r--ChangeLog7
-rw-r--r--generic/tclExecute.c5
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b7530ba..dd8d67d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-24 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * generic/tclExecute.c (VerifyExprObjType): use GET_WIDE_OR_INT to
+ properly have tclIntType used for smaller values. This corrects
+ TclX bug 896727 and any other 3rd party extension that created
+ math functions but was not yet WIDE_INT aware in them.
+
2004-05-24 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* generic/tclInterp.c (TclInitLimitSupport): Made limits work on
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 7d83f86..bff18c9 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.139 2004/05/21 22:03:30 dkf Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.140 2004/05/25 00:07:54 hobbs Exp $
*/
#include "tclInt.h"
@@ -5400,8 +5400,9 @@ VerifyExprObjType(interp, objPtr)
char *s = Tcl_GetStringFromObj(objPtr, &length);
if (TclLooksLikeInt(s, length)) {
+ long i;
Tcl_WideInt w;
- result = Tcl_GetWideIntFromObj((Tcl_Interp *) NULL, objPtr, &w);
+ GET_WIDE_OR_INT(result, objPtr, i, w);
} else {
double d;
result = Tcl_GetDoubleFromObj((Tcl_Interp *) NULL, objPtr, &d);