diff options
| author | Hein-Pieter van Braam | 2017-08-24 22:58:51 +0200 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2017-08-24 23:08:24 +0200 |
| commit | cacced7e507f7603bacc03ae2616e58f0ede122a (patch) | |
| tree | 7af89373e86cd1a7af6ea04e10280084cabb7144 /editor/plugins/collision_shape_2d_editor_plugin.cpp | |
| parent | 4aa2c18cb428ffde05c67987926736a9ca62703b (diff) | |
| download | godot-cacced7e507f7603bacc03ae2616e58f0ede122a.tar.gz godot-cacced7e507f7603bacc03ae2616e58f0ede122a.tar.zst godot-cacced7e507f7603bacc03ae2616e58f0ede122a.zip | |
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/collision_shape_2d_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/collision_shape_2d_editor_plugin.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/editor/plugins/collision_shape_2d_editor_plugin.cpp b/editor/plugins/collision_shape_2d_editor_plugin.cpp index fb2aa1638..945801548 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.cpp +++ b/editor/plugins/collision_shape_2d_editor_plugin.cpp @@ -393,21 +393,21 @@ void CollisionShape2DEditor::_get_current_shape_type() { return; } - if (s->cast_to<CapsuleShape2D>()) { + if (Object::cast_to<CapsuleShape2D>(*s)) { shape_type = CAPSULE_SHAPE; - } else if (s->cast_to<CircleShape2D>()) { + } else if (Object::cast_to<CircleShape2D>(*s)) { shape_type = CIRCLE_SHAPE; - } else if (s->cast_to<ConcavePolygonShape2D>()) { + } else if (Object::cast_to<ConcavePolygonShape2D>(*s)) { shape_type = CONCAVE_POLYGON_SHAPE; - } else if (s->cast_to<ConvexPolygonShape2D>()) { + } else if (Object::cast_to<ConvexPolygonShape2D>(*s)) { shape_type = CONVEX_POLYGON_SHAPE; - } else if (s->cast_to<LineShape2D>()) { + } else if (Object::cast_to<LineShape2D>(*s)) { shape_type = LINE_SHAPE; - } else if (s->cast_to<RayShape2D>()) { + } else if (Object::cast_to<RayShape2D>(*s)) { shape_type = RAY_SHAPE; - } else if (s->cast_to<RectangleShape2D>()) { + } else if (Object::cast_to<RectangleShape2D>(*s)) { shape_type = RECTANGLE_SHAPE; - } else if (s->cast_to<SegmentShape2D>()) { + } else if (Object::cast_to<SegmentShape2D>(*s)) { shape_type = SEGMENT_SHAPE; } else { shape_type = -1; @@ -530,7 +530,7 @@ void CollisionShape2DEditor::edit(Node *p_node) { } if (p_node) { - node = p_node->cast_to<CollisionShape2D>(); + node = Object::cast_to<CollisionShape2D>(p_node); if (!canvas_item_editor->get_viewport_control()->is_connected("draw", this, "_canvas_draw")) canvas_item_editor->get_viewport_control()->connect("draw", this, "_canvas_draw"); @@ -570,7 +570,7 @@ CollisionShape2DEditor::CollisionShape2DEditor(EditorNode *p_editor) { void CollisionShape2DEditorPlugin::edit(Object *p_obj) { - collision_shape_2d_editor->edit(p_obj->cast_to<Node>()); + collision_shape_2d_editor->edit(Object::cast_to<Node>(p_obj)); } bool CollisionShape2DEditorPlugin::handles(Object *p_obj) const { |