summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--generic/tclStringObj.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 54354dc..4db08b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-02 Zoran Vasiljevic <vasiljevic@users.sourceforge.net>
+
+ * generic/tclStringObj.c: (SetStringFromAny): avoid trampling
+ over the tclEmptyStringRep->bytes as it is thread-shared
+ (thx to Gustaf Neumann for the (hard) work of locating this one).
+
2010-03-31 Donal K. Fellows <dkf@users.sf.net>
* doc/package.n: [Bug 2980210]: Document the arguments taken by
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index ab6a600..f91322c 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -33,7 +33,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclStringObj.c,v 1.70.2.20 2010/03/29 21:57:33 dgp Exp $ */
+ * RCS: @(#) $Id: tclStringObj.c,v 1.70.2.21 2010/04/02 14:30:41 vasiljevic Exp $ */
#include "tclInt.h"
#include "tommath.h"
@@ -2948,7 +2948,9 @@ SetStringFromAny(
if (objPtr->bytes != NULL) {
stringPtr->allocated = objPtr->length;
- objPtr->bytes[objPtr->length] = 0;
+ if (objPtr->bytes != tclEmptyStringRep) {
+ objPtr->bytes[objPtr->length] = 0;
+ }
} else {
objPtr->length = 0;
}