[sgen] Make GC handles table lock-free.

[mono.git] / mono / metadata / marshal.c

diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
index 18313f98b12b96c1aa4dcdc79aa057d7f0f0d878..b9edad825d44635bc2facd6c4eb90d16b51ff5b6 100644 (file)
--- a/mono/metadata/marshal.c
+++ b/mono/metadata/marshal.c
@@ -345,7 +345,7 @@ delegate_hash_table_remove (MonoDelegate *d)
                gchandle = GPOINTER_TO_UINT (g_hash_table_lookup (delegate_hash_table, d->delegate_trampoline));
        g_hash_table_remove (delegate_hash_table, d->delegate_trampoline);
        mono_marshal_unlock ();
-       if (mono_gc_is_moving ())
+       if (gchandle && mono_gc_is_moving ())
                mono_gchandle_free (gchandle);
 }