|
From: <sv...@va...> - 2008-05-14 12:40:10
|
Author: sewardj
Date: 2008-05-14 13:40:15 +0100 (Wed, 14 May 2008)
New Revision: 8083
Log:
Merge r7399 (fix for #157665: valgrind fails on shmdt(0) after shmat
to 0)
Modified:
branches/VALGRIND_3_3_BRANCH/coregrind/m_syswrap/syswrap-ppc32-linux.c
branches/VALGRIND_3_3_BRANCH/coregrind/m_syswrap/syswrap-ppc64-linux.c
branches/VALGRIND_3_3_BRANCH/coregrind/m_syswrap/syswrap-x86-linux.c
Modified: branches/VALGRIND_3_3_BRANCH/coregrind/m_syswrap/syswrap-ppc32-linux.c
===================================================================
--- branches/VALGRIND_3_3_BRANCH/coregrind/m_syswrap/syswrap-ppc32-linux.c 2008-05-14 12:35:47 UTC (rev 8082)
+++ branches/VALGRIND_3_3_BRANCH/coregrind/m_syswrap/syswrap-ppc32-linux.c 2008-05-14 12:40:15 UTC (rev 8083)
@@ -887,9 +887,7 @@
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:
Modified: branches/VALGRIND_3_3_BRANCH/coregrind/m_syswrap/syswrap-ppc64-linux.c
===================================================================
--- branches/VALGRIND_3_3_BRANCH/coregrind/m_syswrap/syswrap-ppc64-linux.c 2008-05-14 12:35:47 UTC (rev 8082)
+++ branches/VALGRIND_3_3_BRANCH/coregrind/m_syswrap/syswrap-ppc64-linux.c 2008-05-14 12:40:15 UTC (rev 8083)
@@ -901,9 +901,7 @@
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:
Modified: branches/VALGRIND_3_3_BRANCH/coregrind/m_syswrap/syswrap-x86-linux.c
===================================================================
--- branches/VALGRIND_3_3_BRANCH/coregrind/m_syswrap/syswrap-x86-linux.c 2008-05-14 12:35:47 UTC (rev 8082)
+++ branches/VALGRIND_3_3_BRANCH/coregrind/m_syswrap/syswrap-x86-linux.c 2008-05-14 12:40:15 UTC (rev 8083)
@@ -1278,9 +1278,7 @@
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:
|