Differences From Artifact [f5fdfb6efc]:

• File generic/tclUtf.c — part of check-in [5f2bb912cf] at 2020-05-01 13:38:22 on branch core-8-6-branch — Fix first part of [ed29806baf]: Tcl_UtfToUniChar reads more than TCL_UTF_MAX bytes. Tcl_UtfToUniChar() now never reads more than TCL_UTF_MAX bytes any more. The UtfToUtf encoder/decoder is adapted to do attitional checks (more tricky than in Tcl 8.7, since we want compatibility with earlier 8.6 releases). Other callers of Tcl_UtfToUniChar() needs to be revised for the same problem. Most callers will need to change Tcl_UtfToUniChar() -> TclUtfToUCS4() and Tcl_UtfCharComplete() -> TclUCS4Complete(), but that's not done yet. (user: jan.nijtmans size: 58821) [more...]

To Artifact [fa452f53e1]:

• File generic/tclUtf.c — part of check-in [04631bfc72] at 2020-05-01 15:29:27 on branch bug-ed29806baf — Rebase to core-8-6-branch (I don't think it's solved yet, but let's see) (user: jan.nijtmans size: 58569) [more...]

600
601
602
603
604
605
606
607
608
609
610
611
612

613
614
615
616
617
618
619
620
621
622
623

624
625
626
627
628
629
630
631

600
601
602
603
604
605
606






607

608
609
610
611






612

613
614
615
616
617
618
619

-
-
-
-
-
-
+
-




-
-
-
-
-
-
+
-

	    i++;
	}
	if (i < 0) i = INT_MAX; /* Bug [2738427] */
    } else {
	register const char *endPtr = src + length - TCL_UTF_MAX;

	while (src < endPtr) {
	    if (((unsigned)UCHAR(*src) - 0xF0) < 5) {
		/* treat F0 - F4 as single character */
		ch = 0;
		src++;
	    } else {
		src += TclUtfToUniChar(src, &ch);
	    src += TclUtfToUniChar(src, &ch);
	    }
	    i++;
	}
	endPtr += TCL_UTF_MAX;
	while ((src < endPtr) && Tcl_UtfCharComplete(src, endPtr - src)) {
	    if (((unsigned)UCHAR(*src) - 0xF0) < 5) {
		/* treat F0 - F4 as single character */
		ch = 0;
		src++;
	    } else {
		src += TclUtfToUniChar(src, &ch);
	    src += TclUtfToUniChar(src, &ch);
	    }
	    i++;
	}
	if (src < endPtr) {
	    i += endPtr - src;
	}
    }
    return i;