godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix invalid deref in NativeScript script classes

This commit is contained in:
Will Nations 2018-09-04 08:35:28 -05:00
parent a1b578562a
commit fadf2d2afd
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 { 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"); Ref<NativeScript> script = ResourceLoader::load(p_path, "NativeScript");
if (script.is_valid()) { if (script.is_valid()) {
*r_base_type = script->get_instance_base_type(); if (r_base_type)
*r_icon_path = script->get_script_class_icon_path(); *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(); return script->get_script_class_name();
} }
*r_base_type = String(); if (r_base_type)
*r_icon_path = String(); *r_base_type = String();
if (r_icon_path)
*r_icon_path = String();
return String(); return String();
} }