Skip to content

feat(macos): add support for wcpncpy replacement #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

feat(macos): add support for wcpncpy replacement #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6bea74
feat(macos): add support for wcpncpy replacement
LouisBrunner Nov 3, 2025
5fe7bf7
fix for Linux
LouisBrunner Nov 3, 2025
c8eb34a
better filter
LouisBrunner Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,7 @@ case "${host_os}" in
AC_DEFINE([SDK_13_0], 130000, [SDK_VERS value for Xcode SDK macOS 13.0 / iOS 16])
AC_DEFINE([SDK_14_0], 140000, [SDK_VERS value for Xcode SDK macOS 14.0 / iOS 17])
AC_DEFINE([SDK_15_0], 150000, [SDK_VERS value for Xcode SDK macOS 15.0 / iOS 18])
AC_DEFINE([SDK_26_0], 260000, [SDK_VERS value for Xcode SDK macOS / iOS 26])

# Substitute the Xcode include path detected earlier
AC_SUBST(SDK_INC_DIR, [$xcodedir_inc])
Expand Down Expand Up @@ -721,6 +722,9 @@ case "${host_os}" in
macosx-15.*|iphoneos-18.*)
AC_DEFINE([SDK_VERS], SDK_15_0, [SDK version])
;;
*-26.*)
AC_DEFINE([SDK_VERS], SDK_26_0, [SDK version])
;;
legacy)
AC_DEFINE([SDK_VERS], SDK_10_XX, [SDK version])
;;
Expand Down
8 changes: 4 additions & 4 deletions memcheck/tests/wcpncpy.stderr.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
Conditional jump or move depends on uninitialised value(s)
at 0x........: wcpncpy (vg_replace_strmem.c:2605)
at 0x........: wcpncpy (vg_replace_strmem.c:...)
by 0x........: main (wcpncpy.c:14)

Invalid write of size 4
at 0x........: wcpncpy (vg_replace_strmem.c:2605)
at 0x........: wcpncpy (vg_replace_strmem.c:...)
by 0x........: main (wcpncpy.c:27)
Address 0x........ is 20 bytes inside a block of size 22 alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (wcpncpy.c:10)

Source and destination overlap in wcpncpy(0x........, 0x........)
at 0x........: wcpncpy (vg_replace_strmem.c:2605)
at 0x........: wcpncpy (vg_replace_strmem.c:...)
by 0x........: main (wcpncpy.c:35)

Source and destination overlap in wcpncpy(0x........, 0x........)
at 0x........: wcpncpy (vg_replace_strmem.c:2605)
at 0x........: wcpncpy (vg_replace_strmem.c:...)
by 0x........: main (wcpncpy.c:43)

3 changes: 3 additions & 0 deletions shared/vg_replace_strmem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2603,6 +2603,9 @@ static inline void my_exit ( int x )

#if defined(VGO_linux) || defined(VGO_freebsd) || defined(VGO_solaris)
WCPNCPY(VG_Z_LIBC_SONAME, wcpncpy)
#elif defined(VGO_darwin)
WCPNCPY(libsystemZucZddylib, wcpncpy)
#else
#endif

/*----------------------- wcscat ----------------------*/
Expand Down
1 change: 1 addition & 0 deletions tests/filter_stderr_basic.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ $SED "/sh: [1-9][0-9]*: \(Memory fault\|Alarm call\|Terminated\|Killed\|Abort\)/
# Translate intercepted glibc functions back to their canonical name
perl -p -e "s/: memcpy\@\@?GLIBC_[.1-9]+ \(vg_replace_strmem.c:.*?\)/: memcpy \(vg_replace_strmem.c:...\)/" |
$SED -e "s/: \(__GI_\|__\|\)\(memcmp\|memcpy\|strcpy\|strncpy\|strchr\|strrchr\)\(\|_sse4_1\|_sse42\|_sse2_unaligned\|_sse2\) (vg_replace_strmem.c:/: \2 (vg_replace_strmem.c:/" |
$SED -e "s/: wcpncpy \(vg_replace_strmem.c:.*?\)/: wcpncpy \(vg_replace_strmem.c:...\)/" |

# Remove any ": dumping core" message as the user might have a
# limit set that prevents the core dump
Expand Down
Loading