[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mono-patches
Subject:    [Mono-patches] r130698 - trunk/mono/mono/metadata
From:       "Rodrigo Kumpera (kumpera () gmail ! com)"
Date:       2009-03-31 19:03:01
Message-ID: 20090331190301.7E86E9472C () mono-cvs ! ximian ! com
[Download RAW message or body]

Author: kumpera
Date: 2009-03-31 15:03:01 -0400 (Tue, 31 Mar 2009)
New Revision: 130698

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/loader.c
Log:
2009-03-31 Rodrigo Kumpera  <rkumpera@novell.com>

	* loader.c (mono_field_from_token): Don't crash if the field parent could
	not be decoded.

Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog	2009-03-31 19:02:42 UTC (rev 130697)
+++ trunk/mono/mono/metadata/ChangeLog	2009-03-31 19:03:01 UTC (rev 130698)
@@ -1,3 +1,8 @@
+2009-03-31 Rodrigo Kumpera  <rkumpera@novell.com>
+
+	* loader.c (mono_field_from_token): Don't crash if the field parent could
+	not be decoded.
+
 2009-03-31  Mark Probst  <mark.probst@gmail.com>
 
 	* sgen-gc.c: Execute critical finalizers after ordinary

Modified: trunk/mono/mono/metadata/loader.c
===================================================================
--- trunk/mono/mono/metadata/loader.c	2009-03-31 19:02:42 UTC (rev 130697)
+++ trunk/mono/mono/metadata/loader.c	2009-03-31 19:03:01 UTC (rev 130698)
@@ -538,7 +538,7 @@
 	}
 
 	mono_loader_lock ();
-	if (field && !field->parent->generic_class && !field->parent->generic_container)
+	if (field && field->parent && !field->parent->generic_class && !field->parent->generic_container)
 		g_hash_table_insert (image->field_cache, GUINT_TO_POINTER (token), field);
 	mono_loader_unlock ();
 	return field;

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
[prev in list] [next in list] [prev in thread] [next in thread]