summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Sofer <miguel.sofer@gmail.com>2006-01-23 11:24:36 (GMT)
committerMiguel Sofer <miguel.sofer@gmail.com>2006-01-23 11:24:36 (GMT)
commit81f0f7d83c0d31ad950d4d757b3e12848859d980 (patch)
tree2efebf2b113b58ff153bab367d00984aadd0eab9
parentf388a5c71529a9aa4ed00cadbd0551e19c8c32bb (diff)
downloadtcl-81f0f7d83c0d31ad950d4d757b3e12848859d980.zip
tcl-81f0f7d83c0d31ad950d4d757b3e12848859d980.tar.gz
tcl-81f0f7d83c0d31ad950d4d757b3e12848859d980.tar.bz2
* generic/tclStringObj.c: fixed incorrect handling of internal rep
in Tcl_GetRange [Bug 1410553]. Thanks to twylite and Peter Spjuth.
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclStringObj.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b6b24d..955cde2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-23 Miguel Sofer <msofer@users.sf.net>
+
+ * generic/tclStringObj.c: fixed incorrect handling of internal rep
+ in Tcl_GetRange [Bug 1410553]. Thanks to twylite and Peter Spjuth.
+
2006-01-16 Reinhard Max <max@suse.de>
* generic/tclPipe.c (FileForRedirect): Prevent nameString from
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 5925451..9ec2f63 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 2003/02/19 16:43:28 das Exp $ */
+ * RCS: @(#) $Id: tclStringObj.c,v 1.32.2.1 2006/01/23 11:24:36 msofer Exp $ */
#include "tclInt.h"
@@ -642,7 +642,7 @@ Tcl_GetRange(objPtr, first, last)
stringPtr = GET_STRING(objPtr);
}
- if (stringPtr->numChars == objPtr->length) {
+ if (objPtr->bytes && stringPtr->numChars == objPtr->length) {
char *str = Tcl_GetString(objPtr);
/*