From owner-p4-projects@FreeBSD.ORG  Fri Sep  4 14:05:12 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 42A271065670; Fri,  4 Sep 2009 14:05:12 +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 06E98106566B
	for <perforce@freebsd.org>; Fri,  4 Sep 2009 14:05:12 +0000 (UTC)
	(envelope-from stas@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EA3198FC14
	for <perforce@freebsd.org>; Fri,  4 Sep 2009 14:05:11 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n84E5Bun071815
	for <perforce@freebsd.org>; Fri, 4 Sep 2009 14:05:11 GMT
	(envelope-from stas@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n84E5Bqt071813
	for perforce@freebsd.org; Fri, 4 Sep 2009 14:05:11 GMT
	(envelope-from stas@freebsd.org)
Date: Fri, 4 Sep 2009 14:05:11 GMT
Message-Id: <200909041405.n84E5Bqt071813@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	stas@freebsd.org using -f
From: Stanislav Sedov <stas@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 168156 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: Fri, 04 Sep 2009 14:05:12 -0000

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

Change 168156 by stas@stas_yandex on 2009/09/04 14:05:11

	- siguc might be passed as NULL by valgrind, handle that in the manner
	         linux wrapper does this.

Affected files ...

.. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-amd64-freebsd.c#7 edit
.. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-x86-freebsd.c#7 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_sigframe/sigframe-amd64-freebsd.c#7 (text+ko) ====

@@ -267,8 +267,13 @@
       frame->psigInfo = (Addr)&frame->sigInfo;
    VG_(memcpy)(&frame->sigInfo, siginfo, sizeof(vki_siginfo_t));
 
-   trapno = siguc->uc_mcontext.trapno;
-   err = siguc->uc_mcontext.err;
+   if (siguc != NULL) {
+      trapno = siguc->uc_mcontext.trapno;
+      err = siguc->uc_mcontext.err;
+   } else {
+      trapno = 0;
+      err = 0;
+   }
 
    synth_ucontext(tst->tid, siginfo, trapno, err, mask,
                   &frame->uContext, &frame->fpstate);

==== //depot/projects/valgrind/coregrind/m_sigframe/sigframe-x86-freebsd.c#7 (text+ko) ====

@@ -266,8 +266,13 @@
       frame->psigInfo = (Addr)&frame->sigInfo;
    VG_(memcpy)(&frame->sigInfo, siginfo, sizeof(vki_siginfo_t));
 
-   trapno = siguc->uc_mcontext.trapno;
-   err = siguc->uc_mcontext.err;
+   if (siguc != NULL) {
+      trapno = siguc->uc_mcontext.trapno;
+      err = siguc->uc_mcontext.err;
+   } else {
+      trapno = 0;
+      err = 0;
+   }
 
    synth_ucontext(tst->tid, siginfo, trapno, err, mask,
                   &frame->uContext, &frame->fpstate);