godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Convert Object::cast_to() to the static version

Browse Source 
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:
Hein-Pieter van Braam
2017-08-24 22:58:51 +02:00
parent 4aa2c18cb4
commit cacced7e50
185 changed files with 1314 additions and 1508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scene/3d/spatial.cpp
View File

@@ -128,7 +128,7 @@ void Spatial::_notification(int p_what) {
Node *p = get_parent();
if (p)
data.parent = p->cast_to<Spatial>();
data.parent = Object::cast_to<Spatial>(p);
if (data.parent)
data.C = data.parent->data.children.push_back(this);
@@ -167,7 +167,7 @@ void Spatial::_notification(int p_what) {
data.viewport = NULL;
Node *parent = get_parent();
while (parent && !data.viewport) {
data.viewport = parent->cast_to<Viewport>();
data.viewport = Object::cast_to<Viewport>(parent);
parent = parent->get_parent();
}
@@ -284,7 +284,7 @@ Transform Spatial::get_global_transform() const {
#if 0
void Spatial::add_child_notify(Node *p_child) {
/*
Spatial *s=p_child->cast_to<Spatial>();
Spatial *s=Object::cast_to<Spatial>(p_child);
if (!s)
return;
@@ -299,7 +299,7 @@ void Spatial::add_child_notify(Node *p_child) {
void Spatial::remove_child_notify(Node *p_child) {
/*
Spatial *s=p_child->cast_to<Spatial>();
Spatial *s=Object::cast_to<Spatial>(p_child);
if (!s)
return;