From 3c1d408e8e05b028415ee1a5869e0d210b54961a Mon Sep 17 00:00:00 2001 From: Rodrigo Kumpera Date: Tue, 23 Jun 2009 18:18:28 +0000 Subject: [PATCH] 2009-06-23 Rodrigo Kumpera * metadata-verify.c (is_valid_constant): Fix nullref check. svn path=/trunk/mono/; revision=136728 --- mono/metadata/ChangeLog | 4 ++++ mono/metadata/metadata-verify.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index 08f4e53cb85..1aaca497a3b 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,7 @@ +2009-06-23 Rodrigo Kumpera + + * metadata-verify.c (is_valid_constant): Fix nullref check. + 2009-06-23 Rodrigo Kumpera * 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 a83374aba44..2d0770e2fcb 100644 --- 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; } -- 2.25.1