Merge pull request #2674 from lambdageek/dev/monoerror-mono_field_get_value_object

[mono.git] / mono / metadata / reflection.c

diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index ab0d122d54f400476132509d5a2601144cdb9b58..1d493102f95a40c163e123c14b31cafb4e359547 100644 (file)
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -7554,6 +7554,7 @@ mono_event_get_object_checked (MonoDomain *domain, MonoClass *klass, MonoEvent *
 static MonoObject *
 mono_get_reflection_missing_object (MonoDomain *domain)
 {
+       MonoError error;
        MonoObject *obj;
        static MonoClassField *missing_value_field = NULL;
        
@@ -7564,8 +7565,8 @@ mono_get_reflection_missing_object (MonoDomain *domain)
                missing_value_field = mono_class_get_field_from_name (missing_klass, "Value");
                g_assert (missing_value_field);
        }
-       obj = mono_field_get_value_object (domain, missing_value_field, NULL); 
-       g_assert (obj);
+       obj = mono_field_get_value_object_checked (domain, missing_value_field, NULL, &error);
+       mono_error_assert_ok (&error);
        return obj;
 }
 
@@ -7884,6 +7885,7 @@ mono_method_body_get_object (MonoDomain *domain, MonoMethod *method)
 MonoObject *
 mono_get_dbnull_object (MonoDomain *domain)
 {
+       MonoError error;
        MonoObject *obj;
        static MonoClassField *dbnull_value_field = NULL;
        
@@ -7893,8 +7895,8 @@ mono_get_dbnull_object (MonoDomain *domain)
                dbnull_value_field = mono_class_get_field_from_name (dbnull_klass, "Value");
                g_assert (dbnull_value_field);
        }
-       obj = mono_field_get_value_object (domain, dbnull_value_field, NULL); 
-       g_assert (obj);
+       obj = mono_field_get_value_object_checked (domain, dbnull_value_field, NULL, &error);
+       mono_error_assert_ok (&error);
        return obj;
 }