From d691c75e9445d88d24b1a5595e37a991c87c298c Mon Sep 17 00:00:00 2001 From: Paul Floyd Date: Wed, 5 Jun 2024 08:54:16 +0200 Subject: [PATCH] FreeBSD and Darwin: apply same fix as Bug 488026 --- NEWS | 1 + coregrind/m_initimg/initimg-darwin.c | 2 +- coregrind/m_initimg/initimg-freebsd.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 290d609286..92e669e311 100644 --- a/NEWS +++ b/NEWS @@ -39,6 +39,7 @@ are not entered into bugzilla tend to get forgotten about or ignored. 'guest_IP_AT_SYSCALL' 486293 memccpy false positives 486569 linux inotify_init syscall wrapper missing POST entry in syscall_table +488026 Use of `sizeof` instead of `strlen To see details of a given bug, visit https://bugs.kde.org/show_bug.cgi?id=XXXXXX diff --git a/coregrind/m_initimg/initimg-darwin.c b/coregrind/m_initimg/initimg-darwin.c index 564d2fdaa7..7bac7dc0d1 100644 --- a/coregrind/m_initimg/initimg-darwin.c +++ b/coregrind/m_initimg/initimg-darwin.c @@ -134,7 +134,7 @@ static HChar** setup_client_env ( HChar** origenv, const HChar* toolname) paths. We might not need the space for vgpreload_.so, but it doesn't hurt to over-allocate briefly. The 16s are just cautious slop. */ - Int preload_core_path_len = vglib_len + sizeof(preload_core) + Int preload_core_path_len = vglib_len + VG_(strlen)(preload_core) + sizeof(VG_PLATFORM) + 16; Int preload_tool_path_len = vglib_len + VG_(strlen)(toolname) + sizeof(VG_PLATFORM) + 16; diff --git a/coregrind/m_initimg/initimg-freebsd.c b/coregrind/m_initimg/initimg-freebsd.c index 8c2c6b0e8e..a78875ac28 100644 --- a/coregrind/m_initimg/initimg-freebsd.c +++ b/coregrind/m_initimg/initimg-freebsd.c @@ -145,7 +145,7 @@ static HChar** setup_client_env ( HChar** origenv, const HChar* toolname) paths. We might not need the space for vgpreload_.so, but it doesn't hurt to over-allocate briefly. The 16s are just cautious slop. */ - Int preload_core_path_len = vglib_len + sizeof(preload_core) + Int preload_core_path_len = vglib_len + VG_(strlen)(preload_core) + sizeof(VG_PLATFORM) + 16; Int preload_tool_path_len = vglib_len + VG_(strlen)(toolname) + sizeof(VG_PLATFORM) + 16; -- 2.47.2