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 /main | |
| 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 'main')
| -rw-r--r-- | main/main.cpp | 10 | ||||
| -rw-r--r-- | main/performance.cpp | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/main/main.cpp b/main/main.cpp index 0c6de4325c..14deec67ea 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -981,7 +981,7 @@ Error Main::setup2() { if (bool(GLOBAL_DEF("display/window/handheld/emulate_touchscreen", false))) { if (!OS::get_singleton()->has_touchscreen_ui_hint() && Input::get_singleton() && !editor) { //only if no touchscreen ui hint, set emulation - InputDefault *id = Input::get_singleton()->cast_to<InputDefault>(); + InputDefault *id = Object::cast_to<InputDefault>(Input::get_singleton()); if (id) id->set_emulate_touch(true); } @@ -1181,7 +1181,7 @@ bool Main::start() { StringName instance_type = script_res->get_instance_base_type(); Object *obj = ClassDB::instance(instance_type); - MainLoop *script_loop = obj ? obj->cast_to<MainLoop>() : NULL; + MainLoop *script_loop = Object::cast_to<MainLoop>(obj); if (!script_loop) { if (obj) memdelete(obj); @@ -1215,7 +1215,7 @@ bool Main::start() { ERR_FAIL_V(false); } - main_loop = ml->cast_to<MainLoop>(); + main_loop = Object::cast_to<MainLoop>(ml); if (!main_loop) { memdelete(ml); @@ -1227,7 +1227,7 @@ bool Main::start() { if (main_loop->is_class("SceneTree")) { - SceneTree *sml = main_loop->cast_to<SceneTree>(); + SceneTree *sml = Object::cast_to<SceneTree>(main_loop); #ifdef DEBUG_ENABLED if (debug_collisions) { @@ -1421,7 +1421,7 @@ bool Main::start() { ERR_EXPLAIN("Cannot instance script for autoload, expected 'Node' inheritance, got: " + String(ibt)); ERR_CONTINUE(obj == NULL); - n = obj->cast_to<Node>(); + n = Object::cast_to<Node>(obj); n->set_script(s.get_ref_ptr()); } diff --git a/main/performance.cpp b/main/performance.cpp index 091c52118c..3fb76c22fa 100644 --- a/main/performance.cpp +++ b/main/performance.cpp @@ -125,9 +125,7 @@ float Performance::get_monitor(Monitor p_monitor) const { case OBJECT_NODE_COUNT: { MainLoop *ml = OS::get_singleton()->get_main_loop(); - if (!ml) - return 0; - SceneTree *sml = ml->cast_to<SceneTree>(); + SceneTree *sml = Object::cast_to<SceneTree>(ml); if (!sml) return 0; return sml->get_node_count(); |