From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Tue, 10 Dec 2013 21:40:29 +0000 (+0100)
Subject: Fix segfault at end of simulation.
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a10e029cb1c377218c686858fbb9ba7a5064c9e9

Fix segfault at end of simulation.

Happens when msg_global is NULL, and only with MSG_USE_DEPECATED.
(cherry picked from commit 5f027eea5a8e54151f990b1329b18caa491710a3)

Conflicts:
	src/msg/msg_host.c (change "priv" to "host")
---

diff --git a/src/msg/msg_host.c b/src/msg/msg_host.c
index 2b797aafb1..e7f2714292 100644
--- a/src/msg/msg_host.c
+++ b/src/msg/msg_host.c
@@ -38,8 +38,8 @@ msg_host_t __MSG_host_create(smx_host_t workstation)
   int i;
   char alias[MAX_ALIAS_NAME + 1] = { 0 };       /* buffer used to build the key of the mailbox */
 
-  if (msg_global->max_channel > 0)
-    host->mailboxes = xbt_new0(msg_mailbox_t, msg_global->max_channel);
+  host->mailboxes = (msg_global->max_channel > 0) ?
+    xbt_new0(msg_mailbox_t, msg_global->max_channel) : NULL;
 
   for (i = 0; i < msg_global->max_channel; i++) {
     sprintf(alias, "%s:%d", name, i);
@@ -120,8 +120,7 @@ msg_host_t MSG_host_self(void)
 void __MSG_host_destroy(msg_host_priv_t host) {
 
 #ifdef MSG_USE_DEPRECATED
-  if (msg_global->max_channel > 0)
-    free(host->mailboxes);
+  free(host->mailboxes);
 #endif
   if (xbt_swag_size(host->vms) > 0 ) {
     XBT_VERB("Host shut down, but it still hosts %d VMs. They will be leaked.",xbt_swag_size(host->vms));