From 7ca17ffd2e527a94b2588fa43f774708d0c69191 Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 15 Apr 2009 19:07:04 +0000 Subject: * generic/tclStringObj.c: AppendUnicodeToUnicodeRep failed to set stringPtr->allocated to 0, leading to crashes. --- ChangeLog | 3 +++ generic/tclStringObj.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8f5531a..d0d4347 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ *** 8.5.7 TAGGED FOR RELEASE *** + * generic/tclStringObj.c: AppendUnicodeToUnicodeRep failed + to set stringPtr->allocated to 0, leading to crashes. + * changes: Update for 8.5.7 release. 2009-04-14 Stuart Cassoff diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index dc36242..a0992aa 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.11 2009/04/10 22:14:29 patthoyts Exp $ */ + * RCS: @(#) $Id: tclStringObj.c,v 1.70.2.12 2009/04/15 19:07:04 dgp Exp $ */ #include "tclInt.h" #include "tommath.h" @@ -1410,6 +1410,7 @@ AppendUnicodeToUnicodeRep( appendNumChars * sizeof(Tcl_UniChar)); stringPtr->unicode[numChars] = 0; stringPtr->numChars = numChars; + stringPtr->allocated = 0; Tcl_InvalidateStringRep(objPtr); } -- cgit v0.12