summaryrefslogtreecommitdiffstats
path: root/generic/tclUtil.c
diff options
context:
space:
mode:
authorhobbs <hobbs>2001-07-16 23:14:13 (GMT)
committerhobbs <hobbs>2001-07-16 23:14:13 (GMT)
commit857ae17df742da7ac70bee24c00ca6ce568e9011 (patch)
tree7e9a0ee1031efe79c0206e863be0d5deafb8df3d /generic/tclUtil.c
parent4a83040c8a15e5f30bc3a02f549e71ab156307e8 (diff)
downloadtcl-857ae17df742da7ac70bee24c00ca6ce568e9011.zip
tcl-857ae17df742da7ac70bee24c00ca6ce568e9011.tar.gz
tcl-857ae17df742da7ac70bee24c00ca6ce568e9011.tar.bz2
2001-07-02 Jeff Hobbs <jeffh@ActiveState.com>
* tests/util.test: added util-4.6 * generic/tclUtil.c (Tcl_ConcatObj): Corrected walking backwards over utf-8 chars. [Bug #227512] 2001-06-27 Jeff Hobbs <jeffh@ActiveState.com> * generic/tclUtf.c (Tcl_UtfBackslash): Corrected backslash handling of multibyte utf-8 chars. [Bug #217987] * generic/tclCmdIL.c (InfoProcsCmd): fixed potential mem leak in info procs that created objects without using them. * generic/tclCompCmds.c (TclCompileStringCmd): fixed mem leak when string command failed to parse the subcommand. 2001-05-22 Jeff Hobbs <jeffh@ActiveState.com> * generic/tclObj.c (TclAllocateFreeObjects): simplified objSizePlusPadding to use sizeof(Tcl_Obj) (max)
Diffstat (limited to 'generic/tclUtil.c')
-rw-r--r--generic/tclUtil.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 6e99f32..1aeae89 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUtil.c,v 1.17 1999/12/12 02:26:43 hobbs Exp $
+ * RCS: @(#) $Id: tclUtil.c,v 1.17.2.1 2001/07/16 23:14:13 hobbs Exp $
*/
#include "tclInt.h"
@@ -1071,7 +1071,7 @@ Tcl_ConcatObj(objc, objv)
for (i = 0; i < objc; i++) {
objPtr = objv[i];
element = Tcl_GetStringFromObj(objPtr, &elemLength);
- while ((elemLength > 0)
+ while ((elemLength > 0) && (UCHAR(*element) < 127)
&& (isspace(UCHAR(*element)))) { /* INTL: ISO space. */
element++;
elemLength--;
@@ -1083,7 +1083,7 @@ Tcl_ConcatObj(objc, objv)
* this case it could be significant.
*/
- while ((elemLength > 0)
+ while ((elemLength > 0) && (UCHAR(element[elemLength-1]) < 127)
&& isspace(UCHAR(element[elemLength-1])) /* INTL: ISO space. */
&& ((elemLength < 2) || (element[elemLength-2] != '\\'))) {
elemLength--;