Fix [a9929f112a]: Bugs in the implementation of TIP 577 ("Enhanced index values for Tk").

jan.nijtmans · jan.nijtmans · commit 9f38cb341c11 · 2023-06-23T09:34:22.000Z
Remove compat/stdint.h, since stdint.h is available in all modern C compilers
diff --git a/compat/stdint.h b/compat/stdint.h
diff --git a/generic/tk.h b/generic/tk.h
@@ -149,6 +149,8 @@ typedef const char *Tk_Uid;
 
 #if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 6)
 #   define Tcl_Size int
+#   define TCL_SIZE_MAX INT_MAX
+#   define TCL_SIZE_MODIFIER ""
 #endif
 
 /*
diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c
@@ -120,13 +120,11 @@ UnderlineParseProc(
     obj.bytes = (char *)value;
     obj.length = strlen(value);
     obj.typePtr = NULL;
-    code = TkGetIntForIndex(&obj, TCL_INDEX_END, 0, &underline);
+    code = TkGetIntForIndex(&obj, TCL_INDEX_NONE, 0, &underline);
     if (code == TCL_OK) {
-	if (underline < 0) {
-	    underline = (Tcl_Size)INT_MIN;
-	} else if ((size_t)underline > (size_t)TCL_INDEX_END>>1) {
-		underline++;
-	} else if (underline >= INT_MAX) {
+	if (underline < INT_MIN) {
+	    underline = INT_MIN;
+	} else if (underline > INT_MAX) {
 	    underline = INT_MAX;
 	}
 	*underlinePtr = (int)underline;
diff --git a/generic/tkConfig.c b/generic/tkConfig.c
@@ -683,17 +683,17 @@ DoObjConfig(
     case TK_OPTION_INDEX: {
 	Tcl_Size newIndex;
 
-	if (TkGetIntForIndex(valuePtr, TCL_INDEX_END, 0, &newIndex) != TCL_OK) {
+	if (TkGetIntForIndex(valuePtr, TCL_INDEX_NONE, 0, &newIndex) != TCL_OK) {
 	    if (interp) {
 		Tcl_AppendResult(interp, "bad index \"", Tcl_GetString(valuePtr),
 			"\": must be integer?[+-]integer?, end?[+-]integer?, or \"\"", NULL);
 	    }
 	    return TCL_ERROR;
 	}
-	if (newIndex < 0) {
+	if (newIndex < INT_MIN) {
 	    newIndex = INT_MIN;
-	} else if ((size_t)newIndex > (size_t)TCL_INDEX_END>>1) {
-	    newIndex++;
+	} else if (newIndex > INT_MAX) {
+	    newIndex = INT_MAX;
 	}
 	if (internalPtr != NULL) {
 	    *((int *) oldInternalPtr) = *((int *) internalPtr);
diff --git a/generic/tkIcu.c b/generic/tkIcu.c
@@ -11,13 +11,6 @@
  */
 
 #include "tkInt.h"
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
 
 /*
  * Runtime linking of libicu.
diff --git a/generic/tkInt.h b/generic/tkInt.h
@@ -31,6 +31,8 @@
 #ifdef HAVE_SYS_PARAM_H
 #    include <sys/param.h>
 #endif
+#include <stdint.h>
+#include <stdlib.h>
 #ifdef BYTE_ORDER
 #    ifdef BIG_ENDIAN
 #	 if BYTE_ORDER == BIG_ENDIAN
diff --git a/generic/tkObj.c b/generic/tkObj.c
@@ -241,18 +241,11 @@ TkGetIntForIndex(
 	const char *value = Tcl_GetString(indexObj);
 	if (!*value) {
 	    /* empty string */
-	    *indexPtr = TCL_INDEX_NONE;
+	    *indexPtr = (end == -1) ? -1 - TCL_SIZE_MAX : TCL_INDEX_NONE;
 	    return TCL_OK;
 	}
 	return TCL_ERROR;
     }
-    if (*indexPtr < -1) {
-	*indexPtr = TCL_INDEX_NONE;
-    } else if (end >= -1) {
-        if (*indexPtr > end) {
-            *indexPtr = end + 1;
-        }
-    }
     return TCL_OK;
 }
 
diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c
@@ -175,10 +175,12 @@ static void TextDraw(TextElement *text, Tk_Window tkwin, Drawable d, Ttk_Box b)
 	    text->textLayout, b.x, b.y, 0/*firstChar*/, -1/*lastChar*/);
 
     if (text->underlineObj != NULL) {
-	TkGetIntForIndex(text->underlineObj, TCL_INDEX_END, 0, &underline);
+	TkGetIntForIndex(text->underlineObj, TCL_INDEX_NONE, 0, &underline);
 	if (underline >= 0) {
-	    if ((size_t)underline > (size_t)TCL_INDEX_END>>1) {
-		underline++;
+	    if (underline < INT_MIN) {
+		underline = INT_MIN;
+	    } else if (underline > INT_MAX) {
+		underline = INT_MAX;
 	    }
 	    if (text->embossed) {
 		Tk_UnderlineTextLayout(Tk_Display(tkwin), d, gc2,
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h
@@ -25,7 +25,6 @@
 #include <math.h>
 #include <string.h>
 #include <limits.h>
-#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/file.h>
 #ifdef HAVE_SYS_SELECT_H
diff --git a/unix/Makefile.in b/unix/Makefile.in
@@ -1745,7 +1745,7 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC
 		$(MAC_OSX_DIR)/Tk.xcodeproj/default.pbxuser \
 		$(DISTDIR)/macosx/Tk.xcodeproj
 	$(INSTALL_DATA_DIR) $(DISTDIR)/compat
-	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(TOP_DIR)/compat/stdint.h \
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms \
 		$(TOP_DIR)/compat/stdbool.h $(DISTDIR)/compat
 	$(INSTALL_DATA_DIR) $(DISTDIR)/xlib
 	$(DIST_INSTALL_DATA) $(XLIB_DIR)/*.[ch] $(DISTDIR)/xlib
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
@@ -26,7 +26,6 @@
 #include <math.h>
 #include <string.h>
 #include <limits.h>
-#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/file.h>
 #ifdef HAVE_SYS_SELECT_H
diff --git a/win/tkWinGDI.c b/win/tkWinGDI.c
@@ -14,7 +14,6 @@
 
 
 #include <windows.h>
-#include <stdlib.h>
 #include <math.h>
 #include <wtypes.h>
 #include <winspool.h>
diff --git a/win/tkWinPort.h b/win/tkWinPort.h
@@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <wchar.h>
 #include <io.h>
-#include <stdlib.h>
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/win/tkWinSysTray.c b/win/tkWinSysTray.c
@@ -33,14 +33,6 @@
 
 #define GETHINSTANCE Tk_GetHINSTANCE()
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
 typedef struct IcoInfo {
     HICON hIcon;                /* icon handle returned by LoadIcon. */
     unsigned id;                /* Identifier for command;  used to

Original file line number	Diff line number	Diff line change
`@@ -241,18 +241,11 @@ TkGetIntForIndex(`
`241`	`241`	`const char *value = Tcl_GetString(indexObj);`
`242`	`242`	`if (!*value) {`
`243`	`243`	`/* empty string */`
`244`		`- *indexPtr = TCL_INDEX_NONE;`
	`244`	`+ *indexPtr = (end == -1) ? -1 - TCL_SIZE_MAX : TCL_INDEX_NONE;`
`245`	`245`	`return TCL_OK;`
`246`	`246`	`}`
`247`	`247`	`return TCL_ERROR;`
`248`	`248`	`}`
`249`		`- if (*indexPtr < -1) {`
`250`		`- *indexPtr = TCL_INDEX_NONE;`
`251`		`- } else if (end >= -1) {`
`252`		`- if (*indexPtr > end) {`
`253`		`- *indexPtr = end + 1;`
`254`		`- }`
`255`		`- }`
`256`	`249`	`return TCL_OK;`
`257`	`250`	`}`
`258`	`251`