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/project_settings_editor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'editor/project_settings_editor.cpp') diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 019ed47e8..c221a551b 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -505,7 +505,7 @@ void ProjectSettingsEditor::_action_activated() { void ProjectSettingsEditor::_action_button_pressed(Object *p_obj, int p_column, int p_id) { - TreeItem *ti = p_obj->cast_to(); + TreeItem *ti = Object::cast_to(p_obj); ERR_FAIL_COND(!ti); @@ -1010,7 +1010,7 @@ void ProjectSettingsEditor::_translation_file_open() { void ProjectSettingsEditor::_translation_delete(Object *p_item, int p_column, int p_button) { - TreeItem *ti = p_item->cast_to(); + TreeItem *ti = Object::cast_to(p_item); ERR_FAIL_COND(!ti); int idx = ti->get_metadata(0); @@ -1151,7 +1151,7 @@ void ProjectSettingsEditor::_translation_res_delete(Object *p_item, int p_column Dictionary remaps = ProjectSettings::get_singleton()->get("locale/translation_remaps"); - TreeItem *k = p_item->cast_to(); + TreeItem *k = Object::cast_to(p_item); String key = k->get_metadata(0); ERR_FAIL_COND(!remaps.has(key)); @@ -1180,7 +1180,7 @@ void ProjectSettingsEditor::_translation_res_option_delete(Object *p_item, int p TreeItem *k = translation_remap->get_selected(); ERR_FAIL_COND(!k); - TreeItem *ed = p_item->cast_to(); + TreeItem *ed = Object::cast_to(p_item); ERR_FAIL_COND(!ed); String key = k->get_metadata(0); -- cgit v1.2.3-70-g09d2