summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2003-05-12 19:29:48 (GMT)
committerdgp <dgp@users.sourceforge.net>2003-05-12 19:29:48 (GMT)
commit78a425544eec8223eb72dbc5a1c1f13536a440ef (patch)
treefd5d3b12aa3f4cbf4191602860b8465b89402ca8
parent4d371261ae296c76cb1784f1c9a183b24bd3840f (diff)
downloadtcl-78a425544eec8223eb72dbc5a1c1f13536a440ef.zip
tcl-78a425544eec8223eb72dbc5a1c1f13536a440ef.tar.gz
tcl-78a425544eec8223eb72dbc5a1c1f13536a440ef.tar.bz2
* generic/tclObj.c (tclCmdNameType): Corrected variable use of the
otherValuePtr or the twoPtrValue.ptr1 fields to store a (ResolvedCmdName *) as the internal rep. [Bug 726018].
-rw-r--r--ChangeLog4
-rw-r--r--generic/tclObj.c11
2 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 907edf0..bfed5e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2003-05-12 Don Porter <dgp@users.sourceforge.net>
+ * generic/tclObj.c (tclCmdNameType): Corrected variable use of the
+ otherValuePtr or the twoPtrValue.ptr1 fields to store a
+ (ResolvedCmdName *) as the internal rep. [Bug 726018].
+
* doc/Eval.3: Corrected prototype for Tcl_GlobalEvalObj [Bug 727622].
2003-05-12 Miguel Sofer <msofer@users.sf.net>
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 050dfb6..bf496ec 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.2 2003/04/16 23:31:45 dgp Exp $
+ * RCS: @(#) $Id: tclObj.c,v 1.42.2.3 2003/05/12 19:29:50 dgp Exp $
*/
#include "tclInt.h"
@@ -2991,8 +2991,7 @@ TclSetCmdNameObj(interp, objPtr, cmdPtr)
if ((oldTypePtr != NULL) && (oldTypePtr->freeIntRepProc != NULL)) {
oldTypePtr->freeIntRepProc(objPtr);
}
- objPtr->internalRep.twoPtrValue.ptr1 = (VOID *) resPtr;
- objPtr->internalRep.twoPtrValue.ptr2 = NULL;
+ objPtr->internalRep.otherValuePtr = (VOID *) resPtr;
objPtr->typePtr = &tclCmdNameType;
}
@@ -3074,8 +3073,7 @@ DupCmdNameInternalRep(srcPtr, copyPtr)
register ResolvedCmdName *resPtr =
(ResolvedCmdName *) srcPtr->internalRep.otherValuePtr;
- copyPtr->internalRep.twoPtrValue.ptr1 = (VOID *) resPtr;
- copyPtr->internalRep.twoPtrValue.ptr2 = NULL;
+ copyPtr->internalRep.otherValuePtr = (VOID *) resPtr;
if (resPtr != NULL) {
resPtr->refCount++;
}
@@ -3170,8 +3168,7 @@ SetCmdNameFromAny(interp, objPtr)
objPtr->typePtr->freeIntRepProc(objPtr);
}
- objPtr->internalRep.twoPtrValue.ptr1 = (VOID *) resPtr;
- objPtr->internalRep.twoPtrValue.ptr2 = NULL;
+ objPtr->internalRep.otherValuePtr = (VOID *) resPtr;
objPtr->typePtr = &tclCmdNameType;
return TCL_OK;
}