From: cristianrosa <cristianrosa@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 6 Dec 2010 14:54:14 +0000 (+0000)
Subject: Bugfix: protect SIMIX_context_self() in the case that SIMIX is not initialized.
X-Git-Tag: v3.6_beta2~905
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/99b5293909074fc0bc2348bd719990b91baa365d?hp=b1463660ab52c5a6758ccac6db6ade06607b5f6d

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

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9018 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/simix/private.h b/src/simix/private.h
index 9095077e3c..e3fc539264 100644
--- 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;
 }
 
 /**