diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2025-08-12 10:03:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2025-08-12 10:03:34 (GMT) |
| commit | c31f8caa4db33c3536119f7b6231eaa3033fe4ae (patch) | |
| tree | a91006080f4969888b80e2d83c940f2fa42690d4 /macosx/tclMacOSXFCmd.c | |
| parent | 4f6b05865f90108d30f813b45771ad81ab4a771d (diff) | |
| download | tcl-c31f8caa4db33c3536119f7b6231eaa3033fe4ae.zip tcl-c31f8caa4db33c3536119f7b6231eaa3033fe4ae.tar.gz tcl-c31f8caa4db33c3536119f7b6231eaa3033fe4ae.tar.bz2 | |
Alternative proposed fix for [992f94d847]: avoid misaligned pointers in macOS file attribute functions
Diffstat (limited to 'macosx/tclMacOSXFCmd.c')
| -rw-r--r-- | macosx/tclMacOSXFCmd.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c index e27fdff..a192c23 100644 --- a/macosx/tclMacOSXFCmd.c +++ b/macosx/tclMacOSXFCmd.c @@ -107,6 +107,8 @@ typedef struct finderinfo { } __attribute__ ((__packed__)) finderinfo; typedef struct { + u_int64_t reserved1; /* Make sure data is 8-byte aligned */ + u_int32_t reserved2; /* See [992f94d847] */ u_int32_t info_length; u_int32_t data[8]; } fileinfobuf; @@ -173,7 +175,7 @@ TclMacOSXGetFileAttribute( alist.commonattr = ATTR_CMN_FNDRINFO; } native = (const char *)Tcl_FSGetNativePath(fileName); - result = getattrlist(native, &alist, &finfo, sizeof(fileinfobuf), 0); + result = getattrlist(native, &alist, &finfo.info_length, sizeof(fileinfobuf)-offsetof(fileinfobuf,info_length), 0); if (result != 0) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( @@ -269,7 +271,7 @@ TclMacOSXSetFileAttribute( alist.commonattr = ATTR_CMN_FNDRINFO; } native = (const char *)Tcl_FSGetNativePath(fileName); - result = getattrlist(native, &alist, &finfo, sizeof(fileinfobuf), 0); + result = getattrlist(native, &alist, &finfo.info_length, sizeof(fileinfobuf)-offsetof(fileinfobuf,info_length), 0); if (result != 0) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( @@ -426,7 +428,7 @@ TclMacOSXCopyFileAttributes( alist.bitmapcount = ATTR_BIT_MAP_COUNT; alist.commonattr = ATTR_CMN_FNDRINFO; - if (getattrlist(src, &alist, &finfo, sizeof(fileinfobuf), 0)) { + if (getattrlist(src, &alist, &finfo.info_length, sizeof(fileinfobuf)-offsetof(fileinfobuf,info_length), 0)) { return TCL_ERROR; } if (setattrlist(dst, &alist, &finfo.data, sizeof(finfo.data), 0)) { @@ -448,7 +450,7 @@ TclMacOSXCopyFileAttributes( alist.commonattr = 0; alist.fileattr = ATTR_FILE_RSRCLENGTH; - if (getattrlist(src, &alist, &finfo, sizeof(fileinfobuf), 0)) { + if (getattrlist(src, &alist, &finfo.info_length, sizeof(fileinfobuf)-offsetof(fileinfobuf,info_length), 0)) { return TCL_ERROR; } else if (*rsrcForkSize == 0) { return TCL_OK; @@ -517,7 +519,7 @@ TclMacOSXMatchType( bzero(&alist, sizeof(struct attrlist)); alist.bitmapcount = ATTR_BIT_MAP_COUNT; alist.commonattr = ATTR_CMN_FNDRINFO; - if (getattrlist(pathName, &alist, &finfo, sizeof(fileinfobuf), 0)) { + if (getattrlist(pathName, &alist, &finfo.info_length, sizeof(fileinfobuf)-offsetof(fileinfobuf,info_length), 0)) { return 0; } if ((types->perm & TCL_GLOB_PERM_HIDDEN) && |