From e6c77cacc7c0a01573d9a666b13adf0c68317cec Mon Sep 17 00:00:00 2001 From: suter Date: Mon, 7 Oct 2013 16:35:39 +0200 Subject: [PATCH] seems that get_data can return NULL, add guards --- src/msg/msg_process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); } -- 2.20.1