From: suter <frederic.suter@cc.in2p3.fr>
Date: Mon, 7 Oct 2013 14:35:39 +0000 (+0200)
Subject: seems that get_data can return NULL, add guards
X-Git-Tag: v3_9_90~38^2~36
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e6c77cacc7c0a01573d9a666b13adf0c68317cec

seems that get_data can return NULL, add guards
---

diff --git a/src/msg/msg_process.c b/src/msg/msg_process.c
index c72865ccce..2cefbc744f 100644
--- a/src/msg/msg_process.c
+++ b/src/msg/msg_process.c
@@ -46,12 +46,12 @@ void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc)
   TRACE_msg_process_end(smx_proc);
 #endif
   // free the data if a function was provided
-  if (msg_proc->data && msg_global->process_data_cleanup) {
+  if (msg_proc && msg_proc->data && msg_global->process_data_cleanup) {
     msg_global->process_data_cleanup(msg_proc->data);
   }
 
   // remove the process from its virtual machine
-  if (msg_proc->vm) {
+  if (msg_proc && msg_proc->vm) {
     int pos = xbt_dynar_search(msg_proc->vm->processes,&smx_proc);
     xbt_dynar_remove_at(msg_proc->vm->processes,pos, NULL);
   }