From owner-p4-projects@FreeBSD.ORG  Sat Oct 25 19:29:56 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 23F061065670; Sat, 25 Oct 2008 19:29:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DD0411065681
	for <perforce@freebsd.org>; Sat, 25 Oct 2008 19:29:55 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CABB58FC0A
	for <perforce@freebsd.org>; Sat, 25 Oct 2008 19:29:55 +0000 (UTC)
	(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9PJTt2E010205
	for <perforce@freebsd.org>; Sat, 25 Oct 2008 19:29:55 GMT
	(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9PJTtOT010203
	for perforce@freebsd.org; Sat, 25 Oct 2008 19:29:55 GMT
	(envelope-from peter-gmail@wemm.org)
Date: Sat, 25 Oct 2008 19:29:55 GMT
Message-Id: <200810251929.m9PJTtOT010203@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter-gmail@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 151913 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Oct 2008 19:29:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=151913

Change 151913 by peter@peter_cheese on 2008/10/25 19:28:57

	Make the sysctl wrapper work a little closer to reality.
	oldlenp is always written to if non null.  This is used to
	query ideal buffer sizes.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#17 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#17 (text+ko) ====

@@ -872,16 +872,20 @@
    PRE_MEM_READ("sysctl(name)", ARG1, ARG2 * sizeof(int *));
    if (ARG5 != (UWord)NULL)
       PRE_MEM_READ("sysctl(new)", (Addr)ARG5, ARG6);
-   if (ARG3 != (UWord)NULL) {
-      PRE_MEM_READ("sysctl(oldlenp)", (Addr)ARG4, sizeof(vki_size_t));
-      PRE_MEM_WRITE("sysctl(oldval)", (Addr)ARG3, *(vki_size_t *)ARG4);
+   if (ARG4 != (UWord)NULL) {
+      if (ARG3 != (UWord)NULL) {
+         PRE_MEM_READ("sysctl(oldlenp)", (Addr)ARG4, sizeof(vki_size_t));
+         PRE_MEM_WRITE("sysctl(oldval)", (Addr)ARG3, *(vki_size_t *)ARG4);
+      }
+      PRE_MEM_WRITE("sysctl(oldlenp)", (Addr)ARG4, sizeof(vki_size_t));
    }
 }
 POST(sys___sysctl)
 {
-   if (ARG3 != (UWord)NULL) {
+   if (ARG4 != (UWord)NULL) {
       POST_MEM_WRITE((Addr)ARG4, sizeof(vki_size_t));
-      POST_MEM_WRITE((Addr)ARG3, *(vki_size_t *)ARG4);
+      if (ARG3 != (UWord)NULL)
+         POST_MEM_WRITE((Addr)ARG3, *(vki_size_t *)ARG4);
    }
 }