Test TableFromUtfProc() with strict handling of encoding errors.

sebres · Jan 25, 2023 · d29df9d · d29df9d
1 parent ba635ae
commit d29df9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
@@ -3199,7 +3199,7 @@ TableFromUtfProc(
 	    word = fromUnicode[(ch >> 8)][ch & 0xFF];
 
 	if ((word == 0) && (ch != 0)) {
-	    if ((STOPONERROR) && (flags & TCL_ENCODING_CHAR_LIMIT)) {
+	    if ((STOPONERROR)) {
 		result = TCL_CONVERT_UNKNOWN;
 		break;
 	    }

diff --git a/tests/encoding.test b/tests/encoding.test
@@ -513,8 +513,11 @@ test encoding-17.10 {Utf32ToUtfProc} -body {
     encoding convertfrom -nocomplain utf-32 "\xFF\xFF\xFF\xFF"
 } -result \uFFFD
 
-test encoding-18.1 {TableToUtfProc} {
-} {}
+
+test encoding-18.1 {TableToUtfProc error on invalid input with -strict} -body {
+	list [catch {encoding convertto -strict jis0208 \\} res] $res
+} -result {1 {unexpected character at index 0: 'U+00005C'}}
+
 
 test encoding-19.1 {TableFromUtfProc} {
 } {}
@@ -915,6 +918,7 @@ test encoding-29.0 {get encoding nul terminator lengths} -constraints {
         [testencoding nullength ksc5601]
 } -result {1 2 4 2 2}
 
+
 # cleanup
 namespace delete ::tcl::test::encoding
 ::tcltest::cleanupTests