From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 25 Feb 2008 19:40:14 +0000 (+0000)
Subject: The mutex address may now be left zero when triggering a MutexErr.
X-Git-Tag: svn/VALGRIND_3_4_0~1037
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7942f5b38610dfd224d502b7f6f4e3a7e872f2af;p=thirdparty%2Fvalgrind.git

The mutex address may now be left zero when triggering a MutexErr.

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

diff --git a/exp-drd/drd_error.c b/exp-drd/drd_error.c
index 71b8a2e2bc..e38e6c4df1 100644
--- a/exp-drd/drd_error.c
+++ b/exp-drd/drd_error.c
@@ -262,9 +262,9 @@ static void drd_tool_error_pp(Error* const e)
       VG_(message)(Vg_UserMsg,
                    "%s / mutex 0x%lx (recursion count %d, owner %d)",
                    VG_(get_error_string)(e),
-                   p->mutex,
-                   p->recursion_count,
-                   p->owner);
+                   p ? p->mutex : 0,
+                   p ? p->recursion_count : 0,
+                   p ? p->owner : DRD_INVALID_THREADID);
       VG_(pp_ExeContext)(VG_(get_error_where)(e));
       break;
    }