From d4b257e3ab3d1e41d5eeaa6162e75f2c141359d0 Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Wed, 14 May 2008 12:40:15 +0000 Subject: [PATCH] Merge r7399 (fix for #157665: valgrind fails on shmdt(0) after shmat to 0) git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_3_BRANCH@8083 --- coregrind/m_syswrap/syswrap-ppc32-linux.c | 4 +--- coregrind/m_syswrap/syswrap-ppc64-linux.c | 4 +--- coregrind/m_syswrap/syswrap-x86-linux.c | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c index 41c3612144..af80c110dc 100644 --- a/coregrind/m_syswrap/syswrap-ppc32-linux.c +++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c @@ -887,9 +887,7 @@ POST(sys_ipc) POST_MEM_WRITE( ARG4, sizeof( Addr ) ); addr = deref_Addr ( tid, ARG4, "shmat(addr)" ); - if ( addr > 0 ) { - ML_(generic_POST_sys_shmat)( tid, addr, ARG2, ARG5, ARG3 ); - } + ML_(generic_POST_sys_shmat)( tid, addr, ARG2, ARG5, ARG3 ); break; } case VKI_SHMDT: diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c index 8a05659a34..04ce86e48c 100644 --- a/coregrind/m_syswrap/syswrap-ppc64-linux.c +++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c @@ -901,9 +901,7 @@ POST(sys_ipc) POST_MEM_WRITE( ARG4, sizeof( Addr ) ); addr = deref_Addr ( tid, ARG4, "shmat(addr)" ); - if ( addr > 0 ) { - ML_(generic_POST_sys_shmat)( tid, addr, ARG2, ARG5, ARG3 ); - } + ML_(generic_POST_sys_shmat)( tid, addr, ARG2, ARG5, ARG3 ); break; } case VKI_SHMDT: diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c index 6dd5d4b8fb..24fa29f2fe 100644 --- a/coregrind/m_syswrap/syswrap-x86-linux.c +++ b/coregrind/m_syswrap/syswrap-x86-linux.c @@ -1278,9 +1278,7 @@ POST(sys_ipc) POST_MEM_WRITE( ARG4, sizeof( Addr ) ); addr = deref_Addr ( tid, ARG4, "shmat(addr)" ); - if ( addr > 0 ) { - ML_(generic_POST_sys_shmat)( tid, addr, ARG2, ARG5, ARG3 ); - } + ML_(generic_POST_sys_shmat)( tid, addr, ARG2, ARG5, ARG3 ); break; } case VKI_SHMDT: -- 2.47.2