Added tl_assert() statement on result of VG_(malloc)() calls.

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

diff --git a/exp-drd/drd_error.c b/exp-drd/drd_error.c
index ac496f050d0321a112ab1a77c2a6acd6b6e0bb96..5e92917be07632c281a1168644278f9fc226dec3 100644 (file)
--- a/exp-drd/drd_error.c
+++ b/exp-drd/drd_error.c
@@ -79,6 +79,8 @@ void drd_report_data_race2(Error* const err, const DataRaceErrInfo* const dri)
   tl_assert(dri);
   tl_assert(dri->addr);
   tl_assert(dri->size > 0);
+  tl_assert(descr1);
+  tl_assert(descr2);
 
   descr1[0] = 0;
   descr2[0] = 0;

diff --git a/exp-drd/drd_main.c b/exp-drd/drd_main.c
index a1a5eca7c3c1ca2de300cad25716e31b3ff2e96c..61042c5b47c26f6cf665270503c0819cee2fbbd9 100644 (file)
--- a/exp-drd/drd_main.c
+++ b/exp-drd/drd_main.c
@@ -594,12 +594,13 @@ void drd_post_thread_join(DrdThreadId drd_joiner, DrdThreadId drd_joinee)
 
   if (s_drd_trace_fork_join)
   {
+    const ThreadId joiner = DrdThreadIdToVgThreadId(drd_joiner);
+    const ThreadId joinee = DrdThreadIdToVgThreadId(drd_joinee);
     const unsigned msg_size = 256;
     char* msg;
 
     msg = VG_(malloc)(msg_size);
-    const ThreadId joiner = DrdThreadIdToVgThreadId(drd_joiner);
-    const ThreadId joinee = DrdThreadIdToVgThreadId(drd_joinee);
+    tl_assert(msg);
     VG_(snprintf)(msg, msg_size,
                   "drd_post_thread_join joiner = %d/%d, joinee = %d/%d",
                   joiner, drd_joiner, joinee, drd_joinee);