Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 06:33:16 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #12131 from touilleMan/nativescript-fix-loading

Browse Source 
[Nativescript] fix crash when loading a library with missing godot_nativescript_init
This commit is contained in:
Rémi Verschelde 2017-10-16 10:10:32 +02:00 committed by GitHub
commit edd881cd70
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/gdnative/nativescript/nativescript.cpp
View File

@ -1011,10 +1011,13 @@ void NativeScriptLanguage::init_library(const Ref<GDNativeLibrary> &lib) {
void *proc_ptr;
gdn->get_symbol(_init_call_name, proc_ptr);
((void (*)(godot_string *))proc_ptr)((godot_string *)&lib_path);
Error err = gdn->get_symbol(_init_call_name, proc_ptr);
if (err != OK) {
ERR_PRINT(String("No " + _init_call_name + " in \"" + lib_path + "\" found").utf8().get_data());
} else {
((void (*)(godot_string *))proc_ptr)((godot_string *)&lib_path);
}
} else {
// already initialized. Nice.
}
@ -1138,9 +1141,12 @@ void NativeReloadNode::_notification(int p_what) {
// here the library registers all the classes and stuff.
void *proc_ptr;
L->get()->get_symbol("godot_nativescript_init", proc_ptr);
((void (*)(void *))proc_ptr)((void *)&L->key());
Error err = L->get()->get_symbol("godot_nativescript_init", proc_ptr);
if (err != OK) {
ERR_PRINT(String("No godot_nativescript_init in \"" + L->key() + "\" found").utf8().get_data());
} else {
((void (*)(void *))proc_ptr)((void *)&L->key());
}
for (Map<String, Set<NativeScript *> >::Element *U = NSL->library_script_users.front(); U; U = U->next()) {
for (Set<NativeScript *>::Element *S = U->get().front(); S; S = S->next()) {