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/3d/ray_cast.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scene/3d/ray_cast.cpp') diff --git a/scene/3d/ray_cast.cpp b/scene/3d/ray_cast.cpp index b0aab6cc4d..019bb219ee 100644 --- a/scene/3d/ray_cast.cpp +++ b/scene/3d/ray_cast.cpp @@ -196,7 +196,7 @@ void RayCast::add_exception_rid(const RID &p_rid) { void RayCast::add_exception(const Object *p_object) { ERR_FAIL_NULL(p_object); - CollisionObject *co = ((Object *)p_object)->cast_to(); + const CollisionObject *co = Object::cast_to(p_object); if (!co) return; add_exception_rid(co->get_rid()); @@ -210,7 +210,7 @@ void RayCast::remove_exception_rid(const RID &p_rid) { void RayCast::remove_exception(const Object *p_object) { ERR_FAIL_NULL(p_object); - CollisionObject *co = ((Object *)p_object)->cast_to(); + const CollisionObject *co = Object::cast_to(p_object); if (!co) return; remove_exception_rid(co->get_rid()); -- cgit v1.2.3