summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-03-16 15:53:56 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-03-16 15:53:56 (GMT)
commit1f5f6de21bf647360a9f73bfb4dfce60c25c6312 (patch)
tree81f3d15054871cd80b7cddcaf4297e587158a900
parentfd9d76e6876575165bd011d6724e075f360c601f (diff)
parentdee2f1612dea8ead0ec7def7896d5721d6681035 (diff)
downloadtcl-1f5f6de21bf647360a9f73bfb4dfce60c25c6312.zip
tcl-1f5f6de21bf647360a9f73bfb4dfce60c25c6312.tar.gz
tcl-1f5f6de21bf647360a9f73bfb4dfce60c25c6312.tar.bz2
[Bug #3197864] pointer truncation on Win64 TCL_MEM_DEBUG builds
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclCkalloc.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e175366..d912365 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-16 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tclCkalloc.c: [Bug #3197864] pointer truncation on Win64
+ TCL_MEM_DEBUG builds
+
2011-03-16 Don Porter <dgp@users.sourceforge.net>
* generic/tclBasic.c: Some rewrites to eliminate calls to
diff --git a/generic/tclCkalloc.c b/generic/tclCkalloc.c
index 5579b47..9d3d6d7 100644
--- a/generic/tclCkalloc.c
+++ b/generic/tclCkalloc.c
@@ -81,7 +81,7 @@ static struct mem_header *allocHead = NULL; /* List of allocated structures */
*/
#define BODY_OFFSET \
- ((unsigned long) (&((struct mem_header *) 0)->body))
+ ((size_t) (&((struct mem_header *) 0)->body))
static int total_mallocs = 0;
static int total_frees = 0;
@@ -603,7 +603,7 @@ Tcl_DbCkfree(
* words on these machines).
*/
- memp = (struct mem_header *) (((unsigned long) ptr) - BODY_OFFSET);
+ memp = (struct mem_header *) (((size_t) ptr) - BODY_OFFSET);
if (alloc_tracing) {
fprintf(stderr, "ckfree %lx %ld %s %d\n",
@@ -682,7 +682,7 @@ Tcl_DbCkrealloc(
* See comment from Tcl_DbCkfree before you change the following line.
*/
- memp = (struct mem_header *) (((unsigned long) ptr) - BODY_OFFSET);
+ memp = (struct mem_header *) (((size_t) ptr) - BODY_OFFSET);
copySize = size;
if (copySize > (unsigned int) memp->length) {
@@ -713,7 +713,7 @@ Tcl_AttemptDbCkrealloc(
* See comment from Tcl_DbCkfree before you change the following line.
*/
- memp = (struct mem_header *) (((unsigned long) ptr) - BODY_OFFSET);
+ memp = (struct mem_header *) (((size_t) ptr) - BODY_OFFSET);
copySize = size;
if (copySize > (unsigned int) memp->length) {