From 0801e742abbbe74e43b87b0ea139e700c7094627 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sat, 2 Mar 2019 16:35:26 +0000 Subject: Fix some "scan.test" test-cases when TCL_UTF_MAX=4. Wrongly resolved merge-conflict in previous cherry-pick merge. --- generic/tclScan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generic/tclScan.c b/generic/tclScan.c index ade5f33..1ff83af 100644 --- a/generic/tclScan.c +++ b/generic/tclScan.c @@ -888,8 +888,8 @@ Tcl_ScanObjCmd( offset = TclUtfToUniChar(string, &sch); i = (int)sch; #if TCL_UTF_MAX == 4 - if (!offset) { - offset = TclUtfToUniChar(string, &sch); + if ((sch >= 0xD800) && (offset < 3)) { + offset += TclUtfToUniChar(string+offset, &sch); i = (((i<<10) & 0x0FFC00) + 0x10000) + (sch & 0x3FF); } #endif -- cgit v0.12