Skip to content

Commit 5ff4deb

Browse files
authored
Merge pull request #1113 from Unity-Technologies/fix-null-str-assert
Allow namespace-agnostic class lookup by passing NULL namespace.
2 parents f2f6a87 + 2a02e22 commit 5ff4deb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mono/metadata/class.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -7713,7 +7713,7 @@ find_nocase (gpointer key, gpointer value, gpointer user_data)
77137713
char *name = (char*)key;
77147714
FindUserData *data = (FindUserData*)user_data;
77157715

7716-
if (!data->value && (mono_utf8_strcasecmp (name, (char*)data->key) == 0))
7716+
if (!data->value && (NULL == data->key || (mono_utf8_strcasecmp (name, (char*)data->key) == 0)))
77177717
data->value = value;
77187718
}
77197719

@@ -7808,7 +7808,7 @@ mono_class_from_name_case_checked (MonoImage *image, const char *name_space, con
78087808
continue;
78097809
n = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAME]);
78107810
nspace = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAMESPACE]);
7811-
if (mono_utf8_strcasecmp (n, name) == 0 && mono_utf8_strcasecmp (nspace, name_space) == 0)
7811+
if (mono_utf8_strcasecmp (n, name) == 0 && (NULL == name_space || (mono_utf8_strcasecmp (nspace, name_space) == 0)))
78127812
return mono_class_get_checked (image, MONO_TOKEN_TYPE_DEF | i, error);
78137813
}
78147814
return NULL;

0 commit comments

Comments
 (0)