From 86bf40120b68ff519a334e7217b6ca907e5c9142 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 22 Dec 2014 23:03:23 +0100
Subject: [PATCH] Ensure that MSG_host_self() works from maestro context

---
 src/msg/msg_process.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/msg/msg_process.c b/src/msg/msg_process.c
index 70725e7341..927a4a982f 100644
--- a/src/msg/msg_process.c
+++ b/src/msg/msg_process.c
@@ -294,7 +294,7 @@ msg_host_t MSG_process_get_host(msg_process_t process)
   else {
     simdata = simcall_process_get_data(process);
   }
-  return simdata->m_host;
+  return simdata ? simdata->m_host : NULL;
 }
 
 /** \ingroup m_process_management
-- 
2.20.1