Author: kumpera
Date: 2007-12-05 11:56:45 -0500 (Wed, 05 Dec 2007)
New Revision: 90773
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/verify.c
Log:
2007-12-05 Rodrigo Kumpera <[EMAIL PROTECTED]>
* verify.c: Verify ldlen properly.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2007-12-05 16:53:46 UTC (rev 90772)
+++ trunk/mono/mono/metadata/ChangeLog 2007-12-05 16:56:45 UTC (rev 90773)
@@ -1,3 +1,7 @@
+2007-12-05 Rodrigo Kumpera <[EMAIL PROTECTED]>
+
+ * verify.c: Verify ldlen properly.
+
2007-12-05 Zoltan Varga <[EMAIL PROTECTED]>
* icall.c (ves_icall_MonoField_GetValueInternal): Check that the field
belongs
Modified: trunk/mono/mono/metadata/verify.c
===================================================================
--- trunk/mono/mono/metadata/verify.c 2007-12-05 16:53:46 UTC (rev 90772)
+++ trunk/mono/mono/metadata/verify.c 2007-12-05 16:56:45 UTC (rev 90773)
@@ -2833,6 +2833,22 @@
set_stack_value (stack_push (ctx), mono_class_get_type
(mono_array_class_get (mono_class_from_mono_type (type), 1)), FALSE);
}
+static void
+do_ldlen (VerifyContext *ctx)
+{
+ ILStackDesc *value;
+
+ if (!check_underflow (ctx, 1))
+ return;
+
+ value = stack_pop (ctx);
+
+ if (value->stype != TYPE_COMPLEX || value->type->type !=
MONO_TYPE_SZARRAY)
+ CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Invalid array type
for ldlen at 0x%04x", ctx->ip_offset));
+
+ stack_push_val (ctx, TYPE_NATIVE_INT,
&mono_defaults.int_class->byval_arg);
+}
+
/*Merge the stacks and perform compat checks*/
static void
merge_stacks (VerifyContext *ctx, ILCodeDesc *from, ILCodeDesc *to, int start)
@@ -3447,14 +3463,10 @@
break;
case CEE_LDLEN:
- if (!check_underflow (&ctx, 1))
- break;
- if (stack_top (&ctx)->stype != TYPE_COMPLEX)
- ADD_VERIFY_ERROR (&ctx, g_strdup_printf
("Invalid argument to ldlen at 0x%04x", ip_offset));
- stack_top (&ctx)->type =
&mono_defaults.int32_class->byval_arg; /* FIXME: use a native int type */
- stack_top (&ctx)->stype = TYPE_PTR;
+ do_ldlen (&ctx);
++ip;
break;
+
case CEE_LDELEMA:
if (check_underflow (&ctx, 2))
break;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches