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

Merge pull request #21754 from willnationsdev/fix-script-class-ns

Browse source 
Fix invalid deref in NativeScript script classes
This commit is contained in:
Thomas Herzog 2018-09-04 17:26:10 +02:00 committed by GitHub
commit 93a888e81e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/gdnative/nativescript/nativescript.cpp
View file

@ -1585,12 +1585,16 @@ bool NativeScriptLanguage::handles_global_class_type(const String &p_type) const
String NativeScriptLanguage::get_global_class_name(const String &p_path, String *r_base_type, String *r_icon_path) const {
Ref<NativeScript> script = ResourceLoader::load(p_path, "NativeScript");
if (script.is_valid()) {
*r_base_type = script->get_instance_base_type();
*r_icon_path = script->get_script_class_icon_path();
if (r_base_type)
*r_base_type = script->get_instance_base_type();
if (r_icon_path)
*r_icon_path = script->get_script_class_icon_path();
return script->get_script_class_name();
}
*r_base_type = String();
*r_icon_path = String();
if (r_base_type)
*r_base_type = String();
if (r_icon_path)
*r_icon_path = String();
return String();
}