From cacced7e507f7603bacc03ae2616e58f0ede122a Mon Sep 17 00:00:00 2001 From: Hein-Pieter van Braam Date: Thu, 24 Aug 2017 22:58:51 +0200 Subject: 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/ --- editor/script_editor_debugger.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'editor/script_editor_debugger.cpp') diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index d1ad50354..689bea274 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -215,7 +215,7 @@ void ScriptEditorDebugger::_scene_tree_folded(Object *obj) { return; } - TreeItem *item = obj->cast_to(); + TreeItem *item = Object::cast_to(obj); if (!item) return; @@ -1221,7 +1221,7 @@ void ScriptEditorDebugger::_method_changed(Object *p_base, const StringName &p_n if (!p_base || !live_debug || !connection.is_valid() || !editor->get_edited_scene()) return; - Node *node = p_base->cast_to(); + Node *node = Object::cast_to(p_base); VARIANT_ARGPTRS @@ -1249,7 +1249,7 @@ void ScriptEditorDebugger::_method_changed(Object *p_base, const StringName &p_n return; } - Resource *res = p_base->cast_to(); + Resource *res = Object::cast_to(p_base); if (res && res->get_path() != String()) { @@ -1277,7 +1277,7 @@ void ScriptEditorDebugger::_property_changed(Object *p_base, const StringName &p if (!p_base || !live_debug || !connection.is_valid() || !editor->get_edited_scene()) return; - Node *node = p_base->cast_to(); + Node *node = Object::cast_to(p_base); if (node) { @@ -1308,7 +1308,7 @@ void ScriptEditorDebugger::_property_changed(Object *p_base, const StringName &p return; } - Resource *res = p_base->cast_to(); + Resource *res = Object::cast_to(p_base); if (res && res->get_path() != String()) { -- cgit v1.2.3-70-g09d2