Merge pull request #2820 from kumpera/license-change-rebased

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

diff --git a/mono/metadata/verify.c b/mono/metadata/verify.c
index b60880b929a11e306d0ab18d19ec8a999ec825a0..1d291ddb459d2d26df9f940b10ba05548fd50630 100644 (file)
--- a/mono/metadata/verify.c
+++ b/mono/metadata/verify.c
@@ -7,6 +7,7 @@
  * Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
  * Copyright 2004-2009 Novell, Inc (http://www.novell.com)
  * Copyright 2011 Rodrigo Kumpera
+ * Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 #include <config.h>
 
@@ -4854,9 +4855,10 @@ mono_method_verify (MonoMethod *method, int level)
                return ctx.list;
        }
 
-       ctx.header = mono_method_get_header (method);
+       ctx.header = mono_method_get_header_checked (method, &error);
        if (!ctx.header) {
-               ADD_VERIFY_ERROR (&ctx, g_strdup_printf ("Could not decode method header"));
+               ADD_VERIFY_ERROR (&ctx, g_strdup_printf ("Could not decode method header due to %s", mono_error_get_message (&error)));
+               mono_error_cleanup (&error);
                finish_collect_stats ();
                return ctx.list;
        }
@@ -5015,7 +5017,7 @@ mono_method_verify (MonoMethod *method, int level)
        if (!ctx.valid)
                goto cleanup;
 
-       original_bb = bb = mono_basic_block_split (method, &error);
+       original_bb = bb = mono_basic_block_split (method, &error, ctx.header);
        if (!mono_error_ok (&error)) {
                ADD_VERIFY_ERROR (&ctx, g_strdup_printf ("Invalid branch target: %s", mono_error_get_message (&error)));
                mono_error_cleanup (&error);