2010-02-20 Geoff Norton <gnorton@novell.com>

        * aot-runtime.c: Ensure we dont leak a held lock when unwinding exceptions.

svn path=/trunk/mono/; revision=152122

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 466ada38103636826ed80420d1a2ceacd9af2d07..3b91b693a20c317140c5a15b5a81ff350449f55b 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-20  Geoff Norton  <gnorton@novell.com>
+
+       * aot-runtime.c: Ensure we dont leak a held lock when unwinding exceptions.
+
 2010-02-20  Zoltan Varga  <vargaz@gmail.com>
 
        * debugger-agent.c (mono_debugger_agent_handle_exception): Receive two contexts,

diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c
index 72bb1e2d03bb3d5ed42efd354746967061ce7b75..ce32fbe0c8dc666c66b050281b53c0e378b6cc01 100644 (file)
--- a/mono/mini/aot-runtime.c
+++ b/mono/mini/aot-runtime.c
@@ -2100,6 +2100,7 @@ mono_aot_get_unwind_info (MonoJitInfo *ji, guint32 *unwind_info_len)
                amodule = g_hash_table_lookup (ji_to_amodule, ji);
                g_assert (amodule);
                g_assert (code >= amodule->code && code <= amodule->code_end);
+               mono_aot_unlock ();
        }
 
        p = amodule->unwind_info + ji->used_regs;