mewin/godot-cpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix NULL dereferencing in get_from_variant and cast_to

Browse Source
This commit is contained in:
bruvzg
2018-11-24 17:36:27 +02:00
parent 5225ab2bac
commit be5a012ff7
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/core/Godot.hpp
View File

@@ -24,7 +24,7 @@ namespace godot {
template <class T>
T *as(const Object *obj) {
return (T *)godot::nativescript_api->godot_nativescript_get_userdata(obj->_owner);
return (obj) ? (T *)godot::nativescript_api->godot_nativescript_get_userdata(obj->_owner) : nullptr;
}
template <class T>
@@ -428,6 +428,9 @@ void register_signal(String name, Args... varargs) {
#ifndef GODOT_CPP_NO_OBJECT_CAST
template <class T>
T *Object::cast_to(const Object *obj) {
if (!obj)
return nullptr;
size_t have_tag = (size_t)godot::nativescript_1_1_api->godot_nativescript_get_type_tag(obj->_owner);
if (have_tag) {