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 /editor/plugins/rich_text_editor_plugin.cpp | |
| 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 'editor/plugins/rich_text_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/rich_text_editor_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/rich_text_editor_plugin.cpp b/editor/plugins/rich_text_editor_plugin.cpp index 07c0cced49..2a6474023c 100644 --- a/editor/plugins/rich_text_editor_plugin.cpp +++ b/editor/plugins/rich_text_editor_plugin.cpp @@ -91,7 +91,7 @@ void RichTextEditor::_bind_methods() { void RichTextEditor::edit(Node *p_rich_text) { - node = p_rich_text->cast_to<RichTextLabel>(); + node = Object::cast_to<RichTextLabel>(p_rich_text); } RichTextEditor::RichTextEditor() { @@ -114,7 +114,7 @@ RichTextEditor::RichTextEditor() { void RichTextEditorPlugin::edit(Object *p_object) { - rich_text_editor->edit(p_object->cast_to<Node>()); + rich_text_editor->edit(Object::cast_to<Node>(p_object)); } bool RichTextEditorPlugin::handles(Object *p_object) const { |