summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--generic/tclObj.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 52c5c5d..6b3616e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-18 Miguel Sofer <msofer@users.sf.net>
+
+ * generic/tclObj.c (GetBignumFromObj): replace NULL with
+ tclEmptyStringRep to stop memcpy from complaining in a debug build
+ (the corresponding branch is eliminated by the optimiser
+ otherwise).
+
2005-11-18 Andreas Kupries <andreask@activestate.com>
* generic/tclIO.c (TclFinalizeIOSubsystem): Applied Pat Thoyts'
diff --git a/generic/tclObj.c b/generic/tclObj.c
index e57681f..ea66c42 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -12,7 +12,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.100 2005/11/18 15:58:18 dgp Exp $
+ * RCS: @(#) $Id: tclObj.c,v 1.101 2005/11/18 17:23:02 msofer Exp $
*/
#include "tclInt.h"
@@ -2745,7 +2745,7 @@ GetBignumFromObj(
objPtr->internalRep.ptrAndLongRep.value = 0;
objPtr->typePtr = NULL;
if (objPtr->bytes == NULL) {
- TclInitStringRep(objPtr, NULL, 0);
+ TclInitStringRep(objPtr, tclEmptyStringRep, 0);
}
}
return TCL_OK;