summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorvasiljevic <zv@archiware.com>2010-04-02 14:36:45 (GMT)
committervasiljevic <zv@archiware.com>2010-04-02 14:36:45 (GMT)
commit7c7d90d57d57939779bcba9540d93fb9e359d419 (patch)
treeff11d52134fb0af8829ca9c050163e02263fb861 /generic
parent58031cfb11e3f6825fa69aebd2ff69e42850e9b9 (diff)
downloadtcl-7c7d90d57d57939779bcba9540d93fb9e359d419.zip
tcl-7c7d90d57d57939779bcba9540d93fb9e359d419.tar.gz
tcl-7c7d90d57d57939779bcba9540d93fb9e359d419.tar.bz2
* 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).
Diffstat (limited to 'generic')
-rw-r--r--generic/tclStringObj.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 19f8723..dcdf1eb 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.32.2.12 2009/04/22 17:21:10 andreas_kupries Exp $ */
+ * RCS: @(#) $Id: tclStringObj.c,v 1.32.2.13 2010/04/02 14:36:46 vasiljevic Exp $ */
#include "tclInt.h"
@@ -1869,7 +1869,9 @@ SetStringFromAny(interp, objPtr)
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;
}