From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 7 May 2007 13:22:37 +0000 (+0000)
Subject: Avoid double free: xbt_thread_join already frees the XBT wrapper
X-Git-Tag: v3.3~1872
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b53b3b3484353b0d7ec7e7c4a920d2e7ca42eaf6

Avoid double free: xbt_thread_join already frees the XBT wrapper


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3488 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/xbt/context.c b/src/xbt/context.c
index 8593ea9f78..40f8dc79bc 100644
--- a/src/xbt/context.c
+++ b/src/xbt/context.c
@@ -113,10 +113,9 @@ static void xbt_context_free(xbt_context_t context)
 #ifdef CONTEXT_THREADS
 	/*DEBUG1("\t joining %p",(void *)context->thread->t);*/
 	DEBUG1("\t joining %p",(void *)context->thread);
-	/*pthread_join(context->thread->t,NULL);*/
+
 	xbt_thread_join(context->thread,NULL);
-	DEBUG1("\t xbt_free %p",(void *)context->thread);
-	xbt_free(context->thread);
+
 	DEBUG1("\t mutex_destroy %p",(void *)context->mutex);
 	xbt_mutex_destroy(context->mutex);
 	DEBUG1("\t cond_destroy %p",(void *)context->cond);