diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2017-08-24 22:58:51 +0200 |
|---|---|---|
| committer | Hein-Pieter van Braam <hp@tmm.cx> | 2017-08-24 23:08:24 +0200 |
| commit | cacced7e507f7603bacc03ae2616e58f0ede122a (patch) | |
| tree | 7af89373e86cd1a7af6ea04e10280084cabb7144 /editor/array_property_edit.cpp | |
| parent | 4aa2c18cb428ffde05c67987926736a9ca62703b (diff) | |
| download | redot-engine-cacced7e507f7603bacc03ae2616e58f0ede122a.tar.gz | |
Convert Object::cast_to() to the static version
Currently we rely on some undefined behavior when Object->cast_to() gets
called with a Null pointer. This used to work fine with GCC < 6 but
newer versions of GCC remove all codepaths in which the this pointer is
Null. However, the non-static cast_to() was supposed to be null safe.
This patch makes cast_to() Null safe and removes the now redundant Null
checks where they existed.
It is explained in this article: https://www.viva64.com/en/b/0226/
Diffstat (limited to 'editor/array_property_edit.cpp')
| -rw-r--r-- | editor/array_property_edit.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/editor/array_property_edit.cpp b/editor/array_property_edit.cpp index 06d7d5fdc8..7ef24cf627 100644 --- a/editor/array_property_edit.cpp +++ b/editor/array_property_edit.cpp @@ -273,11 +273,7 @@ void ArrayPropertyEdit::edit(Object *p_obj, const StringName &p_prop, const Stri Node *ArrayPropertyEdit::get_node() { - Object *o = ObjectDB::get_instance(obj); - if (!o) - return NULL; - - return o->cast_to<Node>(); + return Object::cast_to<Node>(ObjectDB::get_instance(obj)); } void ArrayPropertyEdit::_bind_methods() { |