2009-06-23 Rodrigo Kumpera <rkumpera@novell.com>

	* metadata-verify.c (is_valid_constant): Fix nullref check.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 08f4e53cb85f821379cc6da65bc03a8dbbd296a7..1aaca497a3ba7ba32eaf8f791aa0231d4a6dbe94 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-23 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * metadata-verify.c (is_valid_constant): Fix nullref check.
+
 2009-06-23 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * metadata-verify.c (is_valid_constant): Fix string bounds check.

diff --git a/mono/metadata/metadata-verify.c b/mono/metadata/metadata-verify.c
index a83374aba444353af643d53346f9dc32dac63765..2d0770e2fcb63b09daa33c65c5f7ea021ef443d3 100644 (file)
--- a/mono/metadata/metadata-verify.c
+++ b/mono/metadata/metadata-verify.c
@@ -1792,7 +1792,7 @@ is_valid_constant (VerifyContext *ctx, guint32 type, guint32 offset)
        if (ADD_IS_GREATER_OR_OVF (offset, size, blob.size))
                FAIL (ctx, g_strdup_printf ("ContantValue: Not enough room for constant, required %d but have %d", size, blob.size - offset));
 
-       if (type == MONO_TYPE_CLASS && read32 (ctx->data + offset))
+       if (type == MONO_TYPE_CLASS && read32 (ctx->data + blob.offset + offset))
                FAIL (ctx, g_strdup_printf ("ContantValue: Type is class but value is not null"));
        return TRUE;
 }