rename TimeoutFailureException to TimeoutException

[simgrid.git] / src / msg / m_process.c

diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 48d8d41..2af1ec4 100644 (file)
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -36,10 +36,14 @@ void __MSG_process_cleanup(void *arg)
   m_process_t proc = ((smx_process_t) arg)->data;
   xbt_fifo_remove(msg_global->process_list, proc);
   SIMIX_process_cleanup(arg);
-  free(proc->name);
-  proc->name = NULL;
-  free(proc->simdata);
-  proc->simdata = NULL;
+  if (proc->name) {
+    free(proc->name);
+    proc->name = NULL;
+  }
+  if (proc->simdata) {
+    free(proc->simdata);
+    proc->simdata = NULL;
+  }
   free(proc);
 
   return;
@@ -250,7 +254,6 @@ void *MSG_process_get_data(m_process_t process)
 MSG_error_t MSG_process_set_data(m_process_t process, void *data)
 {
   xbt_assert0((process != NULL), "Invalid parameters");
-  xbt_assert0((process->data == NULL), "Data already set");
 
   process->data = data;