You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-09 12:50:35 +00:00
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/
This commit is contained in:
@@ -96,7 +96,7 @@ void GraphNode::_get_property_list(List<PropertyInfo> *p_list) 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_set_as_toplevel())
|
||||
continue;
|
||||
|
||||
@@ -122,7 +122,7 @@ void GraphNode::_resort() {
|
||||
Size2 minsize;
|
||||
|
||||
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)
|
||||
continue;
|
||||
if (c->is_set_as_toplevel())
|
||||
@@ -144,7 +144,7 @@ void GraphNode::_resort() {
|
||||
|
||||
cache_y.clear();
|
||||
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)
|
||||
continue;
|
||||
if (c->is_set_as_toplevel())
|
||||
@@ -375,7 +375,7 @@ Size2 GraphNode::get_minimum_size() const {
|
||||
|
||||
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)
|
||||
continue;
|
||||
if (c->is_set_as_toplevel())
|
||||
@@ -462,7 +462,7 @@ void GraphNode::_connpos_update() {
|
||||
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)
|
||||
continue;
|
||||
if (c->is_set_as_toplevel())
|
||||
|
||||
Reference in New Issue
Block a user