Change TclpLoadMemoryGetBuffer/TclpLoadMemory signature using size_t/…

…Tcl_Size
tcltk · Nov 21, 2024 · 43e17d2 · 43e17d2
1 parent 81aee50
commit 43e17d2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
@@ -3237,7 +3237,8 @@ Tcl_LoadFile(
      */
 
     {
-	int ret, size;
+	Tcl_Size ret;
+	size_t size;
 	void *buffer;
 	Tcl_StatBuf statBuf;
 	Tcl_Channel data;
@@ -3246,13 +3247,13 @@ Tcl_LoadFile(
 	if (ret < 0) {
 	    goto mustCopyToTempAnyway;
 	}
-	size = (int) statBuf.st_size;
+	size = statBuf.st_size;
 
 	/*
-	 * Tcl_Read takes an int:  Determine whether the file size is wide.
+	 * Tcl_Read takes an int:  Determine whether the file size <= INT_MAX
 	 */
 
-	if (size != (Tcl_WideInt) statBuf.st_size) {
+	if (size > INT_MAX) {
 	    goto mustCopyToTempAnyway;
 	}
 	data = Tcl_FSOpenFileChannel(interp, pathPtr, "rb", 0666);

diff --git a/generic/tclInt.h b/generic/tclInt.h
@@ -3478,9 +3478,9 @@ MODULE_SCOPE int	TclpDlopen(Tcl_Interp *interp, Tcl_Obj *pathPtr,
 			    Tcl_FSUnloadFileProc **unloadProcPtr, int flags);
 MODULE_SCOPE int	TclpUtime(Tcl_Obj *pathPtr, struct utimbuf *tval);
 #ifdef TCL_LOAD_FROM_MEMORY
-MODULE_SCOPE void *	TclpLoadMemoryGetBuffer(Tcl_Interp *interp, int size);
+MODULE_SCOPE void *	TclpLoadMemoryGetBuffer(Tcl_Interp *interp, size_t size);
 MODULE_SCOPE int	TclpLoadMemory(Tcl_Interp *interp, void *buffer,
-			    int size, int codeSize, Tcl_LoadHandle *loadHandle,
+			    size_t size, Tcl_Size codeSize, Tcl_LoadHandle *loadHandle,
 			    Tcl_FSUnloadFileProc **unloadProcPtr, int flags);
 #endif
 MODULE_SCOPE void	TclInitThreadStorage(void);

diff --git a/generic/tclLoadNone.c b/generic/tclLoadNone.c
@@ -64,7 +64,7 @@ TclpDlopen(
 MODULE_SCOPE void *
 TclpLoadMemoryGetBuffer(
     TCL_UNUSED(Tcl_Interp *),
-    TCL_UNUSED(int))
+    TCL_UNUSED(size_t))
 {
     return NULL;
 }
@@ -73,8 +73,8 @@ MODULE_SCOPE int
 TclpLoadMemory(
     Tcl_Interp *interp,		/* Used for error reporting. */
     TCL_UNUSED(void *),
-    TCL_UNUSED(int),
-    TCL_UNUSED(int),
+    TCL_UNUSED(size_t),
+    TCL_UNUSED(Tcl_Size),
     TCL_UNUSED(Tcl_LoadHandle *),
     TCL_UNUSED(Tcl_FSUnloadFileProc **),
     TCL_UNUSED(int))

diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c
@@ -489,7 +489,7 @@ UnloadFile(
 MODULE_SCOPE void *
 TclpLoadMemoryGetBuffer(
     TCL_UNUSED(Tcl_Interp *),
-    int size)			/* Size of desired buffer. */
+    size_t size)			/* Size of desired buffer. */
 {
     void *buffer = NULL;
 
@@ -536,8 +536,8 @@ TclpLoadMemory(
     Tcl_Interp *interp,		/* Used for error reporting. */
     void *buffer,		/* Buffer containing the desired code
 				 * (allocated with TclpLoadMemoryGetBuffer). */
-    int size,			/* Allocation size of buffer. */
-    int codeSize,		/* Size of code data read into buffer or -1 if
+    size_t size,		/* Allocation size of buffer. */
+    Tcl_Size codeSize,	/* Size of code data read into buffer or -1 if
 				 * an error occurred and the buffer should
 				 * just be freed. */
     Tcl_LoadHandle *loadHandle, /* Filled with token for dynamically loaded
@@ -577,15 +577,15 @@ TclpLoadMemory(
 #	define arch_abi CPU_ARCH_ABI64
 #endif /*  __LP64__ */
 
-	if ((size_t) codeSize >= sizeof(struct fat_header)
+	if ((size_t)codeSize >= sizeof(struct fat_header)
 		&& fh->magic == OSSwapHostToBigInt32(FAT_MAGIC)) {
 	    uint32_t fh_nfat_arch = OSSwapBigToHostInt32(fh->nfat_arch);
 
 	    /*
 	     * Fat binary, try to find mach_header for our architecture
 	     */
 
-	    if ((size_t) codeSize >= sizeof(struct fat_header) +
+	    if ((size_t)codeSize >= sizeof(struct fat_header) +
 		    fh_nfat_arch * sizeof(struct fat_arch)) {
 		void *fatarchs = (char*)buffer + sizeof(struct fat_header);
 		const NXArchInfo *arch = NXGetLocalArchInfo();