From 53f15cc67318ebe942c270c60268b0396688befc Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 24 Mar 2022 13:18:33 +0000
Subject: Fix internal usage of Tcl_GetRange/Tcl_UtfAtIndex

---
 generic/tclCmdMZ.c     | 6 +++---
 generic/tclExecute.c   | 4 ++--
 generic/tclInt.h       | 2 ++
 generic/tclStringObj.c | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index bd5745b..1beb732 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -395,7 +395,7 @@ Tcl_RegexpObjCmd(
 		newPtr = Tcl_NewListObj(2, objs);
 	    } else {
 		if ((i <= info.nsubs) && (info.matches[i].end > 0)) {
-		    newPtr = Tcl_GetRange(objPtr,
+		    newPtr = TclGetRange(objPtr,
 			    offset + info.matches[i].start,
 			    offset + info.matches[i].end - 1);
 		} else {
@@ -2301,7 +2301,7 @@ StringRangeCmd(
     }
 
     if (last >= 0) {
-	Tcl_SetObjResult(interp, Tcl_GetRange(objv[1], first, last));
+	Tcl_SetObjResult(interp, TclGetRange(objv[1], first, last));
     }
     return TCL_OK;
 }
@@ -3790,7 +3790,7 @@ TclNRSwitchObjCmd(
 	    if (matchVarObj != NULL) {
 		Tcl_Obj *substringObj;
 
-		substringObj = Tcl_GetRange(stringObj,
+		substringObj = TclGetRange(stringObj,
 			info.matches[j].start, info.matches[j].end-1);
 
 		/*
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 0456146..965d821 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5373,7 +5373,7 @@ TEBCresume(
 	if (toIdx < 0) {
 	    TclNewObj(objResultPtr);
 	} else {
-	    objResultPtr = Tcl_GetRange(OBJ_AT_DEPTH(2), fromIdx, toIdx);
+	    objResultPtr = TclGetRange(OBJ_AT_DEPTH(2), fromIdx, toIdx);
 	}
 	TRACE_APPEND(("\"%.30s\"\n", O2S(objResultPtr)));
 	NEXT_INST_V(1, 3, 1);
@@ -5414,7 +5414,7 @@ TEBCresume(
 	    if (toIdx < 0) {
 		TclNewObj(objResultPtr);
 	    } else {
-		objResultPtr = Tcl_GetRange(valuePtr, fromIdx, toIdx);
+		objResultPtr = TclGetRange(valuePtr, fromIdx, toIdx);
 	    }
 	}
 	TRACE_APPEND(("%.30s\n", O2S(objResultPtr)));
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 7486d60..b6cf3b4 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3347,6 +3347,8 @@ MODULE_SCOPE int    TclZipfs_Init(Tcl_Interp *interp);
 #   define TclNumUtfChars Tcl_NumUtfChars
 #   undef TclGetCharLength
 #   define TclGetCharLength Tcl_GetCharLength
+#   undef TclUtfAtIndex
+#   define TclUtfAtIndex Tcl_UtfAtIndex
 #   undef TclGetRange
 #   define TclGetRange Tcl_GetRange
 #endif
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 332d1d2..6032dbb 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -2449,7 +2449,7 @@ Tcl_AppendFormatToObj(
 		    if (precision < 1) {
 			TclNewObj(segment);
 		    } else {
-			segment = Tcl_GetRange(segment, 0, precision - 1);
+			segment = TclGetRange(segment, 0, precision - 1);
 		    }
 		    numChars = precision;
 		    Tcl_IncrRefCount(segment);
-- 
cgit v0.12