summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Sofer <miguel.sofer@gmail.com>2007-08-24 11:22:09 (GMT)
committerMiguel Sofer <miguel.sofer@gmail.com>2007-08-24 11:22:09 (GMT)
commita8bfcfc6e80c0eaedcdf8e6c9c9088fea32e4ffa (patch)
tree611a4a8779f6e4426263aa275fbf207df5fbb33f
parentbcd8740c3dfb63ffc3fbe93c49e3d03e61a78a3c (diff)
downloadtcl-a8bfcfc6e80c0eaedcdf8e6c9c9088fea32e4ffa.zip
tcl-a8bfcfc6e80c0eaedcdf8e6c9c9088fea32e4ffa.tar.gz
tcl-a8bfcfc6e80c0eaedcdf8e6c9c9088fea32e4ffa.tar.bz2
* generic/tclCompile.c: replaced copy loop that tripped some
compilers with memmove [Bug 1780870]
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclCompile.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 81324d8..483e1bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-24 Miguel Sofer <msofer@users.sf.net>
+
+ * generic/tclCompile.c: replaced copy loop that tripped some
+ compilers with memmove [Bug 1780870]
+
2007-08-14 Don Porter <dgp@users.sourceforge.net>
* tests/trace.test: Backport some tests.
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 4a6fac5..59617b0 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.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: tclCompile.c,v 1.43.2.7 2006/11/28 22:20:00 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclCompile.c,v 1.43.2.8 2007/08/24 11:22:16 msofer Exp $
*/
#include "tclInt.h"
@@ -2837,10 +2837,10 @@ TclFixupForwardJump(envPtr, jumpFixupPtr, jumpDist, distThreshold)
TclExpandCodeArray(envPtr);
}
jumpPc = (envPtr->codeStart + jumpFixupPtr->codeOffset);
- for (numBytes = envPtr->codeNext-jumpPc-2, p = jumpPc+2+numBytes-1;
- numBytes > 0; numBytes--, p--) {
- p[3] = p[0];
- }
+ numBytes = envPtr->codeNext-jumpPc-2;
+ p = jumpPc+2;
+ memmove(p+3, p, numBytes);
+
envPtr->codeNext += 3;
jumpDist += 3;
switch (jumpFixupPtr->jumpType) {