From: Tom Hughes <tom@compton.nu>
Date: Fri, 5 Aug 2005 07:22:00 +0000 (+0000)
Subject: Allow a NULL second argument to clock_getres. Fixes bug #110203.
X-Git-Tag: svn/VALGRIND_3_1_0~662
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=888f6e02cff45e1d8e0dfc60b7bf0bb5bdebcda2;p=thirdparty%2Fvalgrind.git

Allow a NULL second argument to clock_getres. Fixes bug #110203.


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

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 0a11d806f0..a5cddcecce 100644
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -5709,11 +5709,13 @@ PRE(sys_clock_getres)
    // defined above!
    PRE_REG_READ2(long, "clock_getres", 
                  vki_clockid_t, clk_id, struct timespec *, res);
-   PRE_MEM_WRITE( "clock_getres(res)", ARG2, sizeof(struct vki_timespec) );
+   if (ARG2 != 0)
+      PRE_MEM_WRITE( "clock_getres(res)", ARG2, sizeof(struct vki_timespec) );
 }
 POST(sys_clock_getres)
 {
-   POST_MEM_WRITE( ARG2, sizeof(struct vki_timespec) );
+   if (ARG2 != 0)
+      POST_MEM_WRITE( ARG2, sizeof(struct vki_timespec) );
 }
 
 PRE(sys_clock_nanosleep)