summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--generic/tclStringObj.c10
-rw-r--r--tests/stringObj.test8
3 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b7f01b..891b36c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2009-03-20 Don Porter <dgp@users.sourceforge.net>
+ * generic/tclStringObj.c: Test stringObj-6.9 checks that
+ * tests/stringObj.test: Tcl_AppendStringsToObj() no longer
+ crashes when operating on a pure unicode value. [Bug 2597185]
+
* generic/tclExecute.c (INST_CONCAT1): Panic when appends overflow
the max length of a Tcl value. [Bug 2669109]
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index e7c8aae..6775273 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.6 2009/02/05 13:59:20 dgp Exp $ */
+ * RCS: @(#) $Id: tclStringObj.c,v 1.70.2.7 2009/03/21 02:54:23 dgp Exp $ */
#include "tclInt.h"
#include "tommath.h"
@@ -1548,6 +1548,13 @@ Tcl_AppendStringsToObjVA(
SetStringFromAny(NULL, objPtr);
/*
+ * Force the existence of a string rep. so we avoid crashes operating
+ * on a pure unicode value. [Bug 2597185]
+ */
+
+ (void) Tcl_GetStringFromObj(objPtr, &oldLength);
+
+ /*
* Figure out how much space is needed for all the strings, and expand the
* string representation if it isn't big enough. If no bytes would be
* appended, just return. Note that on some platforms (notably OS/390) the
@@ -1556,7 +1563,6 @@ Tcl_AppendStringsToObjVA(
nargs = 0;
newLength = 0;
- oldLength = objPtr->length;
while (1) {
string = va_arg(argList, char *);
if (string == NULL) {
diff --git a/tests/stringObj.test b/tests/stringObj.test
index 90ec9c3..d497262 100644
--- a/tests/stringObj.test
+++ b/tests/stringObj.test
@@ -12,7 +12,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: stringObj.test,v 1.16 2004/05/19 20:15:32 dkf Exp $
+# RCS: @(#) $Id: stringObj.test,v 1.16.14.1 2009/03/21 02:54:23 dgp Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest
@@ -160,6 +160,12 @@ test stringObj-6.8 {Tcl_AppendStringsToObj procedure, object totally empty} test
teststringobj appendstrings 1 {}
list [teststringobj length2 1] [teststringobj get 1]
} {0 {}}
+test stringObj-6.9 {Tcl_AppendStringToObj, pure unicode} {
+ testobj freeallvars
+ teststringobj set2 1 [string replace abc 1 1 d]
+ teststringobj appendstrings 1 foo bar soom
+ teststringobj get 1
+} adcfoobarsoom
test stringObj-7.1 {SetStringFromAny procedure} testobj {
testobj freeallvars