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 71b8a2e2bcba6c6308271e627dc923977d26b1b4..e38e6c4df1ae620265ba62604d60579aa60bbef6 100644 (file)
--- 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;
    }