diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2005-11-29 14:02:02 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2005-11-29 14:02:02 (GMT) |
| commit | 78e4bd756c392b75621c7d8c46d00a7cc2c03701 (patch) | |
| tree | 1128e6e95a2bb6e12506385bd371e00436ad8a4f /generic | |
| parent | d8635a48cf1f669a2c8103dacc8a93e3e3269b87 (diff) | |
| download | tcl-78e4bd756c392b75621c7d8c46d00a7cc2c03701.zip tcl-78e4bd756c392b75621c7d8c46d00a7cc2c03701.tar.gz tcl-78e4bd756c392b75621c7d8c46d00a7cc2c03701.tar.bz2 | |
Fix [Bug 1310081].
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclObj.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/generic/tclObj.c b/generic/tclObj.c index 7ae0b5e..9d480d5 100644 --- a/generic/tclObj.c +++ b/generic/tclObj.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: tclObj.c,v 1.42.2.13 2005/08/04 19:54:29 dgp Exp $ + * RCS: @(#) $Id: tclObj.c,v 1.42.2.14 2005/11/29 14:02:04 dkf Exp $ */ #include "tclInt.h" @@ -2574,9 +2574,20 @@ Tcl_GetWideIntFromObj(interp, objPtr, wideIntPtr) register int result; if (objPtr->typePtr == &tclWideIntType) { + gotWide: *wideIntPtr = objPtr->internalRep.wideValue; return TCL_OK; } + if (objPtr->typePtr == &tclIntType) { + /* + * This cast is safe; all valid ints/longs are wides. + */ + + objPtr->internalRep.wideValue = + Tcl_LongAsWide(objPtr->internalRep.longValue); + objPtr->typePtr = &tclWideIntType; + goto gotWide; + } result = SetWideIntFromAny(interp, objPtr); if (result == TCL_OK) { *wideIntPtr = objPtr->internalRep.wideValue; |