Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #659 from groud/fix_null_init 

Avoid crash in Variant constructor from nullptr Object*
pull/664/head
Bastiaan Olij 2021-11-25 11:16:55 +11:00 committed by GitHub
parent d619c612d5 55ba2602db
commit 50512f0dee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/variant/variant.cpp
View File

@ -171,7 +171,12 @@ Variant::Variant(const godot::RID &v) {
} }
Variant::Variant(const Object *v) { Variant::Variant(const Object *v) {
from_type_constructor[OBJECT](ptr(), const_cast<GodotObject **>(&v->_owner)); if (v) {
from_type_constructor[OBJECT](ptr(), const_cast<GodotObject **>(&v->_owner));
} else {
GodotObject *nullobject = nullptr;
from_type_constructor[OBJECT](ptr(), &nullobject);
}
} }
Variant::Variant(const Callable &v) { Variant::Variant(const Callable &v) {