diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-08 14:38:48 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-08 14:38:48 (GMT) |
commit | 0b4d13b85c2515d59f4854f113466e482a205c58 (patch) | |
tree | da2bdc31544ecf861a6256f070ae3f5ee83dc438 /generic/tclTest.c | |
parent | aca8877841974ff650c1929762d3afa734e06f1c (diff) | |
parent | 914c6a316c41664cd15cc32176c2d52d6c546009 (diff) | |
download | tcl-0b4d13b85c2515d59f4854f113466e482a205c58.zip tcl-0b4d13b85c2515d59f4854f113466e482a205c58.tar.gz tcl-0b4d13b85c2515d59f4854f113466e482a205c58.tar.bz2 |
Merge 8.7
Diffstat (limited to 'generic/tclTest.c')
-rw-r--r-- | generic/tclTest.c | 12 |
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; } } |