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 /scene/gui/split_container.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 'scene/gui/split_container.cpp')
| -rw-r--r-- | scene/gui/split_container.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/split_container.cpp b/scene/gui/split_container.cpp index 5fc3db4672..5515c0f0cd 100644 --- a/scene/gui/split_container.cpp +++ b/scene/gui/split_container.cpp @@ -44,7 +44,7 @@ Control *SplitContainer::_getch(int p_idx) const { int idx = 0; for (int i = 0; i < get_child_count(); i++) { - Control *c = get_child(i)->cast_to<Control>(); + Control *c = Object::cast_to<Control>(get_child(i)); if (!c || !c->is_visible_in_tree()) continue; if (c->is_set_as_toplevel()) |