From: Tom Hughes <tom@compton.nu>
Date: Wed, 20 Jul 2005 09:32:35 +0000 (+0000)
Subject: The timeout argument to rt_sigtimedwait is in the third argument not
X-Git-Tag: svn/VALGRIND_3_0_0~104
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c41eefec836d944c15770acdb58f7da9ca02504;p=thirdparty%2Fvalgrind.git

The timeout argument to rt_sigtimedwait is in the third argument not
the fourth, plus linux allows it to be null.


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

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 73357b9c27..a7fb692cf6 100644
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -5243,8 +5243,9 @@ PRE(sys_rt_sigtimedwait)
       PRE_MEM_READ(  "rt_sigtimedwait(set)",  ARG1, sizeof(vki_sigset_t));
    if (ARG2 != 0)
       PRE_MEM_WRITE( "rt_sigtimedwait(info)", ARG2, sizeof(vki_siginfo_t) );
-   PRE_MEM_READ( "rt_sigtimedwait(timeout)",
-                 ARG4, sizeof(struct vki_timespec) );
+   if (ARG3 != 0)
+      PRE_MEM_READ( "rt_sigtimedwait(timeout)",
+                    ARG3, sizeof(struct vki_timespec) );
 }
 
 POST(sys_rt_sigtimedwait)