diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-01-18 15:52:13 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-01-18 15:52:13 (GMT) |
| commit | ae78b892336fb5325a124506f2de9e283760857c (patch) | |
| tree | 04dd21e507e2eece455ffffefbeef87056e04c42 /generic/tclStringObj.c | |
| parent | b563c159d7f63f0a4ca1e9190ec4111d5d4908d9 (diff) | |
| parent | f97560a94963b378ccc5b75e5dbc2949eca30b9f (diff) | |
| download | tcl-ae78b892336fb5325a124506f2de9e283760857c.zip tcl-ae78b892336fb5325a124506f2de9e283760857c.tar.gz tcl-ae78b892336fb5325a124506f2de9e283760857c.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tclStringObj.c')
| -rw-r--r-- | generic/tclStringObj.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index d3f0024..7a2c1f2 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -731,7 +731,7 @@ Tcl_GetRange( if (TclIsPureByteArray(objPtr)) { unsigned char *bytes = Tcl_GetByteArrayFromObj(objPtr, &length); - if (last >= length) { + if (last < 0 || last >= length) { last = length - 1; } if (last < first) { @@ -757,7 +757,7 @@ Tcl_GetRange( TclNumUtfChars(stringPtr->numChars, objPtr->bytes, objPtr->length); } if (stringPtr->numChars == objPtr->length) { - if (last >= stringPtr->numChars) { + if (last < 0 || last >= stringPtr->numChars) { last = stringPtr->numChars - 1; } if (last < first) { @@ -778,7 +778,7 @@ Tcl_GetRange( FillUnicodeRep(objPtr); stringPtr = GET_STRING(objPtr); } - if (last >= stringPtr->numChars) { + if (last < 0 || last >= stringPtr->numChars) { last = stringPtr->numChars - 1; } if (last < first) { @@ -2087,7 +2087,11 @@ Tcl_AppendFormatToObj( if (gotPrecision) { numChars = Tcl_GetCharLength(segment); if (precision < numChars) { - segment = Tcl_GetRange(segment, 0, precision - 1); + if (precision < 1) { + TclNewObj(segment); + } else { + segment = Tcl_GetRange(segment, 0, precision - 1); + } numChars = precision; Tcl_IncrRefCount(segment); allocSegment = 1; |