From bcc916d762591d6fae72ea0ba0ac0c747bcc0173 Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 16 Jun 2017 11:47:46 +0000 Subject: Better define the meaning of "first" and "last". --- generic/tclStringObj.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index aa99545..0a38836 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -2848,8 +2848,10 @@ TclStringCatObjv( Tcl_Obj **objPtrPtr) { Tcl_Obj *objPtr, *objResultPtr, * const *ov; - int oc, length = 0, binary = 1, first = 0, last = 0; + int oc, length = 0, binary = 1; int allowUniChar = 1, requestUniChar = 0; + int first = objc - 1; /* Index of first value possibly not empty */ + int last = 0; /* Index of last value possibly not empty */ /* assert ( objc >= 0 ) */ @@ -2981,9 +2983,9 @@ TclStringCatObjv( } while (--oc); } - if (last == first /*|| length == 0 */) { + if (last <= first /*|| length == 0 */) { /* Only one non-empty value or zero length; return first */ - /* NOTE: (length == 0) implies (last == first) */ + /* NOTE: (length == 0) implies (last <= first) */ *objPtrPtr = objv[first]; return TCL_OK; } -- cgit v0.12