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/ --- scene/2d/path_2d.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'scene/2d/path_2d.cpp') diff --git a/scene/2d/path_2d.cpp b/scene/2d/path_2d.cpp index a79f60c96..d2474d955 100644 --- a/scene/2d/path_2d.cpp +++ b/scene/2d/path_2d.cpp @@ -137,13 +137,8 @@ void PathFollow2D::_notification(int p_what) { case NOTIFICATION_ENTER_TREE: { - Node *parent = get_parent(); - if (parent) { - - path = parent->cast_to(); - if (path) { - _update_transform(); - } + if ((path = Object::cast_to(get_parent()))) { + _update_transform(); } } break; @@ -231,7 +226,7 @@ String PathFollow2D::get_configuration_warning() const { if (!is_visible_in_tree() || !is_inside_tree()) return String(); - if (!get_parent() || !get_parent()->cast_to()) { + if (!Object::cast_to(get_parent())) { return TTR("PathFollow2D only works when set as a child of a Path2D node."); } -- cgit v1.2.3-70-g09d2