Bugfix: protect SIMIX_context_self() in the case that SIMIX is not initialized.

[simgrid.git] / src / simix / private.h

diff --git a/src/simix/private.h b/src/simix/private.h
index 9095077..e3fc539 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -238,11 +238,11 @@ static XBT_INLINE void SIMIX_context_runall(xbt_swag_t processes)
  */
 static XBT_INLINE smx_context_t SIMIX_context_self(void)
 {
-  if (simix_global->context_factory == NULL) {
-    return NULL;
+  if (simix_global && simix_global->context_factory != NULL) {
+    return (*(simix_global->context_factory->self))();
   }
 
-  return (*(simix_global->context_factory->self))();
+  return NULL;
 }
 
 /**