* with the appropriate arguments, then return NULL to report the failure. The error
* should be propagated until it reaches code which can throw managed exceptions. At that
* point, an exception should be thrown based on the information returned by
- * mono_loader_get_error (). Then the error should be cleared by calling
+ * mono_loader_get_last_error (). Then the error should be cleared by calling
* mono_loader_clear_error ().
*/
set_loader_error (error);
}
+/*
+ * mono_loader_set_error_bad_image:
+ *
+ * Set the loader error for this thread.
+ */
+void
+mono_loader_set_error_bad_image (char *msg)
+{
+ MonoLoaderError *error;
+
+ if (mono_loader_get_last_error ())
+ return;
+
+ error = g_new0 (MonoLoaderError, 1);
+ error->exception_type = MONO_EXCEPTION_BAD_IMAGE;
+ error->msg = msg;
+
+ set_loader_error (error);
+}
+
+
/*
* mono_loader_get_last_error:
*
if (ex) {
g_free (ex->class_name);
g_free (ex->assembly_name);
+ g_free (ex->msg);
g_free (ex);
TlsSetValue (loader_error_thread_id, NULL);
class_name = mono_string_new (mono_domain_get (), cname);
- ex = mono_get_exception_type_load (class_name, aname);
+ ex = mono_get_exception_type_load (class_name, aname);
g_free (cname);
g_free (aname);
- break;
+ break;
}
case MONO_EXCEPTION_MISSING_METHOD: {
char *cname = g_strdup (error->class_name);
class_name = g_strdup_printf ("%s%s%s", cnspace, cnspace ? "." : "", cname);
ex = mono_get_exception_missing_field (class_name, cmembername);
- g_free (class_name);
+ g_free (class_name);
g_free (cname);
g_free (cmembername);
g_free (cnspace);
- break;
+ break;
}
case MONO_EXCEPTION_FILE_NOT_FOUND: {
g_free (filename);
break;
}
-
+
+ case MONO_EXCEPTION_BAD_IMAGE: {
+ char *msg = g_strdup (error->msg);
+ mono_loader_clear_error ();
+ ex = mono_get_exception_bad_image_format (msg);
+ g_free (msg);
+ break;
+ }
+
default:
g_assert_not_reached ();
}
const char *ptr;
guint32 idx = mono_metadata_token_index (token);
- if (image->dynamic) {
- MonoClassField *result = mono_lookup_dynamic_token (image, token, context);
- *retklass = result->parent;
- return result;
- }
-
mono_metadata_decode_row (&tables [MONO_TABLE_MEMBERREF], idx-1, cols, MONO_MEMBERREF_SIZE);
nindex = cols [MONO_MEMBERREF_CLASS] >> MONO_MEMBERREF_PARENT_BITS;
class = cols [MONO_MEMBERREF_CLASS] & MONO_MEMBERREF_PARENT_MASK;
case MONO_MEMBERREF_PARENT_TYPEDEF:
klass = mono_class_get (image, MONO_TOKEN_TYPE_DEF | nindex);
if (!klass) {
- char *name = mono_class_name_from_token (image, MONO_TOKEN_TYPE_REF | nindex);
- g_warning ("Missing field %s in class %s (typeref index %d)", fname, name, nindex);
+ char *name = mono_class_name_from_token (image, MONO_TOKEN_TYPE_DEF | nindex);
+ g_warning ("Missing field %s in class %s (typedef index %d)", fname, name, nindex);
+ mono_loader_set_error_type_load (name, image->assembly_name);
g_free (name);
return NULL;
}
klass = mono_class_from_typeref (image, MONO_TOKEN_TYPE_REF | nindex);
if (!klass) {
char *name = mono_class_name_from_token (image, MONO_TOKEN_TYPE_REF | nindex);
- g_warning ("Missing field %s in class %s (typeref index %d)", fname, name, nindex);
+ g_warning ("missing field %s in class %s (typeref index %d)", fname, name, nindex);
+ mono_loader_set_error_type_load (name, image->assembly_name);
g_free (name);
return NULL;
}
mono_class_init (klass);
g_print ("type in sig: %s\n", klass->name);*/
klass = mono_class_get_full (image, MONO_TOKEN_TYPE_SPEC | nindex, context);
+ //FIXME can't klass be null?
mono_class_init (klass);
if (retklass)
*retklass = klass;
MonoClassField *field;
if (image->dynamic) {
- MonoClassField *result = mono_lookup_dynamic_token (image, token, context);
+ MonoClassField *result;
+ MonoClass *handle_class;
+
+ *retklass = NULL;
+ result = mono_lookup_dynamic_token_class (image, token, TRUE, &handle_class, context);
+ // This checks the memberref type as well
+ if (result && handle_class != mono_defaults.fieldhandle_class) {
+ mono_loader_set_error_bad_image (g_strdup ("Bad field token."));
+ return NULL;
+ }
*retklass = result->parent;
return result;
}
}
mono_loader_lock ();
- if (field && !field->parent->generic_class)
+ if (field && !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;
if (!klass) {
char *name = mono_class_name_from_token (image, MONO_TOKEN_TYPE_REF | nindex);
g_warning ("Missing method %s in assembly %s, type %s", mname, image->name, name);
- mono_loader_set_error_method_load (name, mname);
+ mono_loader_set_error_type_load (name, image->assembly_name);
g_free (name);
return NULL;
}
if (!klass) {
char *name = mono_class_name_from_token (image, MONO_TOKEN_TYPE_SPEC | nindex);
g_warning ("Missing method %s in assembly %s, type %s", mname, image->name, name);
- mono_loader_set_error_method_load (name, mname);
+ mono_loader_set_error_type_load (name, image->assembly_name);
g_free (name);
return NULL;
}
if (!klass) {
char *name = mono_class_name_from_token (image, MONO_TOKEN_TYPE_DEF | nindex);
g_warning ("Missing method %s in assembly %s, type %s", mname, image->name, name);
- mono_loader_set_error_method_load (name, mname);
+ mono_loader_set_error_type_load (name, image->assembly_name);
g_free (name);
return NULL;
}
int size, i;
guint32 cols [MONO_TYPEDEF_SIZE];
- if (image->dynamic)
- return mono_lookup_dynamic_token (image, token, context);
+ if (image->dynamic) {
+ MonoClass *handle_class;
+
+ result = mono_lookup_dynamic_token_class (image, token, TRUE, &handle_class, context);
+ // This checks the memberref type as well
+ if (result && handle_class != mono_defaults.methodhandle_class) {
+ mono_loader_set_error_bad_image (g_strdup ("Bad method token."));
+ return NULL;
+ }
+ return result;
+ }
if (table != MONO_TABLE_METHOD) {
if (table == MONO_TABLE_METHODSPEC) {
if (used_context) *used_context = FALSE;
+ if (idx > image->tables [MONO_TABLE_METHOD].rows) {
+ mono_loader_set_error_bad_image (g_strdup ("Bad method token."));
+ return NULL;
+ }
+
mono_metadata_decode_row (&image->tables [MONO_TABLE_METHOD], idx - 1, cols, 6);
if ((cols [2] & METHOD_ATTRIBUTE_PINVOKE_IMPL) ||
mono_method_get_param_names (MonoMethod *method, const char **names)
{
int i, lastp;
- MonoClass *klass = method->klass;
+ MonoClass *klass;
MonoTableInfo *methodt;
MonoTableInfo *paramt;
guint32 idx;
+ if (method->is_inflated)
+ method = ((MonoMethodInflated *) method)->declaring;
+
if (!mono_method_signature (method)->param_count)
return;
for (i = 0; i < mono_method_signature (method)->param_count; ++i)
names [i] = "";
- if (klass->generic_class || klass->rank) /* copy the names later */
+ klass = method->klass;
+ if (klass->rank)
return;
mono_class_init (klass);
projects / mono.git / blobdiff