|
From: <sv...@va...> - 2008-04-01 18:38:25
|
Author: bart
Date: 2008-04-01 19:38:29 +0100 (Tue, 01 Apr 2008)
New Revision: 7837
Log:
Added tl_assert() statement on result of VG_(malloc)() calls.
Modified:
trunk/exp-drd/drd_error.c
trunk/exp-drd/drd_main.c
Modified: trunk/exp-drd/drd_error.c
===================================================================
--- trunk/exp-drd/drd_error.c 2008-04-01 18:27:41 UTC (rev 7836)
+++ trunk/exp-drd/drd_error.c 2008-04-01 18:38:29 UTC (rev 7837)
@@ -79,6 +79,8 @@
tl_assert(dri);
tl_assert(dri->addr);
tl_assert(dri->size > 0);
+ tl_assert(descr1);
+ tl_assert(descr2);
descr1[0] = 0;
descr2[0] = 0;
Modified: trunk/exp-drd/drd_main.c
===================================================================
--- trunk/exp-drd/drd_main.c 2008-04-01 18:27:41 UTC (rev 7836)
+++ trunk/exp-drd/drd_main.c 2008-04-01 18:38:29 UTC (rev 7837)
@@ -594,12 +594,13 @@
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);
|