From: Bart Van Assche <bvanassche@acm.org>
Date: Thu, 2 Feb 2012 10:14:30 +0000 (+0000)
Subject: drd: Avoid that an assertion failure is triggered if clone() fails.
X-Git-Tag: svn/VALGRIND_3_8_0~490
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=099ef8542e3734a98911cd31eccc2f0d0fe3a20e;p=thirdparty%2Fvalgrind.git

drd: Avoid that an assertion failure is triggered if clone() fails.

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

diff --git a/drd/drd_main.c b/drd/drd_main.c
index 364795e06a..3ac34df700 100644
--- a/drd/drd_main.c
+++ b/drd/drd_main.c
@@ -639,7 +639,14 @@ static void drd_thread_finished(ThreadId vg_tid)
 {
    DrdThreadId drd_tid;
 
+#if 0
+   /*
+    * The assert statement below doesn't hold if this function is invoked
+    * because thread creation failed. See e.g.
+    * coregrind/m_syswrap/syswrap-amd64-linux.c
+    */
    tl_assert(VG_(get_running_tid)() == vg_tid);
+#endif
 
    drd_tid = DRD_(VgThreadIdToDrdThreadId)(vg_tid);
    if (DRD_(thread_get_trace_fork_join)())