From 5b624e8ca129a3a099300e94a510f20ff6e11520 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 23 Jun 2023 17:30:50 +0200 Subject: [PATCH] Update valgrind-3.21.0-no-memcpy-replace-check.patch (memcpy_chk) Resolves: #2214374 __memmove_chk seen as __memcpy_chk --- valgrind-3.21.0-no-memcpy-replace-check.patch | 11 ++++++++++- valgrind.spec | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/valgrind-3.21.0-no-memcpy-replace-check.patch b/valgrind-3.21.0-no-memcpy-replace-check.patch index cdb0c0a..6e26e04 100644 --- a/valgrind-3.21.0-no-memcpy-replace-check.patch +++ b/valgrind-3.21.0-no-memcpy-replace-check.patch @@ -1,5 +1,5 @@ diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c -index b32f13f76..aa7f88ca2 100644 +index b32f13f76..464e8d4ca 100644 --- a/shared/vg_replace_strmem.c +++ b/shared/vg_replace_strmem.c @@ -1128,7 +1128,7 @@ static inline void my_exit ( int x ) @@ -11,3 +11,12 @@ index b32f13f76..aa7f88ca2 100644 #if defined(VGO_linux) /* For older memcpy we have to use memmove-like semantics and skip +@@ -1714,8 +1714,6 @@ static inline void my_exit ( int x ) + RECORD_COPY(len); \ + if (len == 0) \ + return dst; \ +- if (is_overlap(dst, src, len, len)) \ +- RECORD_OVERLAP_ERROR("memcpy_chk", dst, src, len); \ + if ( dst > src ) { \ + d = (HChar *)dst + len - 1; \ + s = (const HChar *)src + len - 1; \ diff --git a/valgrind.spec b/valgrind.spec index 2945c0d..1434bd7 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -477,6 +477,7 @@ fi * Fri Jun 23 2023 Mark Wielaard - Add valgrind-3.21.0-callgrind_control-no-strict.patch - Add valgrind-3.21.0-realloc-again.patch +- Update valgrind-3.21.0-no-memcpy-replace-check.patch (memcpy_chk) * Tue May 16 2023 Alexandra Hájková - 3.21.0-3 - Add valgrind-3.21.0-Add-with-gdbscripts-dir.patch