diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-16 12:55:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-16 12:55:49 (GMT) |
| commit | c13d3b0405d83b8253f84a139fd4d4f98af35b8f (patch) | |
| tree | efd7417594f2a5c0ec8f9c558631d786f2bbc06d | |
| parent | a3a070b13cb5312958d8193be0e406362776a528 (diff) | |
| parent | 0943b7181074269ccea4e40288d91575ae211a0a (diff) | |
| download | tcl-c13d3b0405d83b8253f84a139fd4d4f98af35b8f.zip tcl-c13d3b0405d83b8253f84a139fd4d4f98af35b8f.tar.gz tcl-c13d3b0405d83b8253f84a139fd4d4f98af35b8f.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | generic/tclTest.c | 6 | ||||
| -rw-r--r-- | tests/utf.test | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c index a8ca463..c31abf3 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -6914,8 +6914,10 @@ TestUtfNextCmd( /* Run Tcl_UtfNext with many more possible bytes at src[end], all should give the same result */ result = Tcl_UtfNext(buffer + 1); if (first != result) { - first = buffer; - break; + Tcl_SetObjResult(interp, Tcl_ObjPrintf( + "Tcl_UtfNext is not supposed to read src[end]\n" + "Different result when src[end] is %#x", UCHAR(p[-1]))); + return TCL_ERROR; } } diff --git a/tests/utf.test b/tests/utf.test index 935830c..b645580 100644 --- a/tests/utf.test +++ b/tests/utf.test @@ -253,8 +253,8 @@ test utf-6.22 {Tcl_UtfNext} {testutfnext testbytestring} { testutfnext [testbytestring \xD0\xF8] } 1 test utf-6.23 {Tcl_UtfNext} {testutfnext testbytestring} { - testutfnext [testbytestring \xE8] -} -1 + testutfnext [testbytestring \xE8\x00] +} 1 test utf-6.24 {Tcl_UtfNext} {testutfnext testbytestring} { testutfnext [testbytestring \xE8]G } 1 |