Fix an assert in sgen when mono_gc_set_current_thread_appdomain () is called from...

diff --git a/mono/metadata/sgen-gc.c b/mono/metadata/sgen-gc.c
index 181cfc97a5c0d672a3a7c8fd4a3049c2148928ac..b5d836f3ff7d20afbc09aed9b228b24736b4c88e 100644 (file)
--- a/mono/metadata/sgen-gc.c
+++ b/mono/metadata/sgen-gc.c
@@ -2235,8 +2235,12 @@ void
 mono_gc_set_current_thread_appdomain (MonoDomain *domain)
 {
        SgenThreadInfo *info = mono_thread_info_current ();
-       g_assert (info);
-       info->stopped_domain = domain;
+
+       /* Could be called from sgen_thread_unregister () with a NULL info */
+       if (domain) {
+               g_assert (info);
+               info->stopped_domain = domain;
+       }
 }
 
 gboolean