summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorWill Nations <willnationsdev@gmail.com>2018-09-04 08:35:28 -0500
committerWill Nations <willnationsdev@gmail.com>2018-09-04 08:35:28 -0500
commitfadf2d2afd1f69655599607893f5e6f058964af6 (patch)
treea9389e72476fcc524a4071f5c7ac56a1dda1b233 /modules
parenta1b578562a6db61db668c0ea620df9f23989d23f (diff)
Fix invalid deref in NativeScript script classes
Diffstat (limited to 'modules')
-rw-r--r--modules/gdnative/nativescript/nativescript.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/modules/gdnative/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp
index 147e375fe6..3f88fabebd 100644
--- a/modules/gdnative/nativescript/nativescript.cpp
+++ b/modules/gdnative/nativescript/nativescript.cpp
@@ -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();
}