summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-05-21 16:56:27 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-05-21 16:56:27 (GMT)
commitbc30387f724f38297d65a0ae87c11341b809b8f0 (patch)
treef30c1902d727ee732c8814a1aa59eeae6b54a80b /generic
parentc165b1b8ae2365a2afce837baf0ca643a80fe9c2 (diff)
parenta6a7e5ca7699ad328ed645c207aaba8b69e32a53 (diff)
downloadtcl-bc30387f724f38297d65a0ae87c11341b809b8f0.zip
tcl-bc30387f724f38297d65a0ae87c11341b809b8f0.tar.gz
tcl-bc30387f724f38297d65a0ae87c11341b809b8f0.tar.bz2
When using Tcl_SetObjLength() calls to grow and shrink the objPtr->bytes buffer,
care must be taken that the value cannot possibly become pure Unicode. Calling Tcl_AppendToObj() has the possibility of making such a conversion. Bug found while valgrinding the trunk.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclFileName.c4
-rw-r--r--generic/tclPathObj.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 5048308..b130169 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -863,7 +863,7 @@ TclpNativeJoinPath(
if (length > 0 && (start[length-1] != '/')) {
Tcl_AppendToObj(prefix, "/", 1);
- length++;
+ Tcl_GetStringFromObj(prefix, &length);
}
needsSep = 0;
@@ -899,7 +899,7 @@ TclpNativeJoinPath(
if ((length > 0) &&
(start[length-1] != '/') && (start[length-1] != ':')) {
Tcl_AppendToObj(prefix, "/", 1);
- length++;
+ Tcl_GetStringFromObj(prefix, &length);
}
needsSep = 0;
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 4f86755..2402128 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -1087,7 +1087,7 @@ TclJoinPath(
if (length > 0 && ptr[length -1] != '/') {
Tcl_AppendToObj(res, &separator, 1);
- length++;
+ Tcl_GetStringFromObj(res, &length);
}
Tcl_SetObjLength(res, length + (int) strlen(strElt));