asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #35150 from akien-mga/愚かな猿

Browse source 
Mono: Fix parsing assembly names as UTF-8
This commit is contained in:
Rémi Verschelde 2020-01-15 17:52:41 +01:00 committed by GitHub
commit 1aa998cd85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/mono/mono_gd/gd_mono_assembly.cpp
View file

@ -129,7 +129,7 @@ MonoAssembly *GDMonoAssembly::_search_hook(MonoAssemblyName *aname, void *user_d
(void)user_data; // UNUSED (void)user_data; // UNUSED
String name = mono_assembly_name_get_name(aname); String name = String::utf8(mono_assembly_name_get_name(aname));
bool has_extension = name.ends_with(".dll") || name.ends_with(".exe"); bool has_extension = name.ends_with(".dll") || name.ends_with(".exe");
if (no_search) if (no_search)
@ -176,7 +176,7 @@ MonoAssembly *GDMonoAssembly::_preload_hook(MonoAssemblyName *aname, char **, vo
no_search = true; no_search = true;
in_preload = true; in_preload = true;
String name = mono_assembly_name_get_name(aname); String name = String::utf8(mono_assembly_name_get_name(aname));
bool has_extension = name.ends_with(".dll"); bool has_extension = name.ends_with(".dll");
GDMonoAssembly *res = NULL; GDMonoAssembly *res = NULL;
@ -276,7 +276,7 @@ GDMonoAssembly *GDMonoAssembly::_load_assembly_from(const String &p_name, const
} }
void GDMonoAssembly::_wrap_mono_assembly(MonoAssembly *assembly) { void GDMonoAssembly::_wrap_mono_assembly(MonoAssembly *assembly) {
String name = mono_assembly_name_get_name(mono_assembly_get_name(assembly)); String name = String::utf8(mono_assembly_name_get_name(mono_assembly_get_name(assembly)));
MonoImage *image = mono_assembly_get_image(assembly); MonoImage *image = mono_assembly_get_image(assembly);