zenithsiz/ftmemsim-valgrind
1
0
Fork 0
mirror of https://github.com/Zenithsiz/ftmemsim-valgrind.git synced 2026-02-08 21:09:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 359201 followup. futex skips argument 5 if op is FUTEX_WAIT_BITSET.

Browse Source 
The original fix in svn r15793 read argument 6 separately by using PRA6
unconditionally. This is wrong. We need to first check whether a
track_pre_reg_read callback is registered (only memcheck does).
The PRE_REG_READX macro already had this check. Just add the same
before calling PRA6. Thanks to Tom Hughes for noticing. Without this
helgrind/tests/cond_timedwait_test and drd/tests/pth_inconsistent_cond_wait
regtests would fail.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15795
This commit is contained in:
Mark Wielaard
2016-02-18 11:14:47 +00:00
parent be2da24d6c
commit 54794decc8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coregrind/m_syswrap/syswrap-linux.c
View File

@@ -1163,7 +1163,8 @@ PRE(sys_futex)
PRE_REG_READ4(long, "futex",
vki_u32 *, futex, int, op, int, val,
struct timespec *, utime);
PRA6("futex",int,val3);
if (VG_(tdict).track_pre_reg_read)
PRA6("futex",int,val3);
}
break;
case VKI_FUTEX_WAKE_BITSET: