BZ #342795 Internal glibc __GI_mempcpy call should be intercepted.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14866

diff --git a/NEWS b/NEWS
index 04125f91436341076e49472fc31a31a480a84c88..fddc3c676869ddc44a94a1c0ab9ceb730cacf8b4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -99,6 +99,7 @@ where XXXXXX is the bug number as listed below.
 341789  aarch64: shmat fails with valgrind on ARMv8
 342063  wrong format specifier for test mcblocklistsearch in gdbserver_tests
 342221  socket connect false positive uninit memory for unknown af family
+342795  Internal glibc __GI_mempcpy call should be intercepted
 n-i-bz  Provide implementations of certain compiler builtins to support
         compilers who may not provide those
 n-i-bz  Old STABS code is still being compiled, but never used. Remove it.

diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
index 4ca652b4597c00fbf2dd922b02df574e09e090c3..5203306bd7c276c7d0e57db01233c7a5f32c1d8d 100644 (file)
--- a/shared/vg_replace_strmem.c
+++ b/shared/vg_replace_strmem.c
@@ -1363,6 +1363,7 @@ static inline void my_exit ( int x )
 
 #if defined(VGO_linux)
  GLIBC25_MEMPCPY(VG_Z_LIBC_SONAME, mempcpy)
+ GLIBC25_MEMPCPY(VG_Z_LIBC_SONAME, __GI_mempcpy)
  GLIBC25_MEMPCPY(VG_Z_LD_SO_1,     mempcpy) /* ld.so.1 */
  GLIBC25_MEMPCPY(VG_Z_LD_LINUX_SO_3, mempcpy) /* ld-linux.so.3 */
  GLIBC25_MEMPCPY(VG_Z_LD_LINUX_X86_64_SO_2, mempcpy) /* ld-linux-x86-64.so.2 */