Author: martin
Date: 2006-06-21 09:41:56 -0400 (Wed, 21 Jun 2006)
New Revision: 61905
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/reflection.c
Log:
2006-06-21 Martin Baulig <[EMAIL PROTECTED]>
* reflection.c
(method_encode_clauses): Don't assert on `ex_info->handlers' here;
fixes #76484.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2006-06-21 13:31:25 UTC (rev 61904)
+++ trunk/mono/mono/metadata/ChangeLog 2006-06-21 13:41:56 UTC (rev 61905)
@@ -1,3 +1,9 @@
+2006-06-21 Martin Baulig <[EMAIL PROTECTED]>
+
+ * reflection.c
+ (method_encode_clauses): Don't assert on `ex_info->handlers' here;
+ fixes #76484.
+
2006-06-21 Zoltan Varga <[EMAIL PROTECTED]>
* object.h (mono_array_setref): Cast value to (MonoObject*) to fix
warnings.
Modified: trunk/mono/mono/metadata/reflection.c
===================================================================
--- trunk/mono/mono/metadata/reflection.c 2006-06-21 13:31:25 UTC (rev
61904)
+++ trunk/mono/mono/metadata/reflection.c 2006-06-21 13:41:56 UTC (rev
61905)
@@ -873,7 +873,8 @@
for (i = mono_array_length (ilgen->ex_handlers) - 1; i >= 0; --i) {
ex_info = (MonoILExceptionInfo*)mono_array_addr
(ilgen->ex_handlers, MonoILExceptionInfo, i);
finally_start = ex_info->start + ex_info->len;
- g_assert (ex_info->handlers);
+ if (!ex_info->handlers)
+ continue;
for (j = 0; j < mono_array_length (ex_info->handlers); ++j) {
ex_block = (MonoILExceptionBlock*)mono_array_addr
(ex_info->handlers, MonoILExceptionBlock, j);
clause = &(clauses [clause_index]);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches