2010-07-10 Rodrigo Kumpera <rkumpera@novell.com>

	* loader.c (mono_method_signature_checked): Release the domain
	lock on failure.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 8642b2bc4318e5f6f78d4cbe0da7e276248ca8df..21e3b724ed894369d1563a88c03bb50896f46282 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-10 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * loader.c (mono_method_signature_checked): Release the domain
+       lock on failure.
+
 2010-07-10  Mark Probst  <mark.probst@gmail.com>
 
        * sgen-gc.c: Store the forwarding address in the first word of an

diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c
index f465e67b00d2af04f55aa2b17e1fed5717270a52..746bb2eea45f9123747772f3457b10482993816b 100644 (file)
--- a/mono/metadata/loader.c
+++ b/mono/metadata/loader.c
@@ -2126,8 +2126,10 @@ mono_method_signature_checked (MonoMethod *m, MonoError *error)
                /* the lock is recursive */
                signature = mono_method_signature (imethod->declaring);
                signature = inflate_generic_signature_checked (imethod->declaring->klass->image, signature, mono_method_get_context (m), error);
-               if (!mono_error_ok (error))
+               if (!mono_error_ok (error)) {
+                       mono_loader_unlock ();
                        return NULL;
+               }
 
                inflated_signatures_size += mono_metadata_signature_size (signature);