Merge 8.7

1 files changed, 7 insertions, 5 deletions

diff --git a/generic/tclTest.c b/generic/tclTest.c
index 8a60baa..39ea585 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -6834,13 +6834,15 @@ TestUtfNextCmd(
 	bytes = Tcl_GetString(objv[1]);
 	numBytes = objv[1]->length;
 
-    if (numBytes > (int)sizeof(buffer)-3) {
-	Tcl_AppendResult(interp, "\"testutfnext\" can only handle 29 bytes", NULL);
+    if (numBytes > (int)sizeof(buffer) - 4) {
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"\"testutfnext\" can only handle %d bytes",
+		(int)sizeof(buffer) - 4));
 	return TCL_ERROR;
     }
 
     memcpy(buffer + 1, bytes, numBytes);
-    buffer[0] = buffer[numBytes + 1] = buffer[numBytes + 2] = '\x00';
+    buffer[0] = buffer[numBytes + 1] = buffer[numBytes + 2] = buffer[numBytes + 3] = '\xA0';
 
     first = result = TclUtfNext(buffer + 1);
     while ((buffer[0] = *p++) != '\0') {
@@ -6856,8 +6858,8 @@ TestUtfNextCmd(
 	/* Run Tcl_UtfNext with many more possible bytes at src[end], all should give the same result */
 	result = TclUtfNext(buffer + 1);
 	if (first != result) {
-	    Tcl_AppendResult(interp, "Tcl_UtfNext is not supposed to read src[end]", NULL);
-	    return TCL_ERROR;
+	    first = buffer;
+	    break;
 	}
     }