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/screen_button.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scene/2d/screen_button.cpp') diff --git a/scene/2d/screen_button.cpp b/scene/2d/screen_button.cpp index e8e5e9411..c39b12fc9 100644 --- a/scene/2d/screen_button.cpp +++ b/scene/2d/screen_button.cpp @@ -196,11 +196,11 @@ void TouchScreenButton::_input(const Ref &p_event) { ERR_FAIL_COND(!is_visible_in_tree()); - const InputEventScreenTouch *st = p_event->cast_to(); + const InputEventScreenTouch *st = Object::cast_to(*p_event); if (passby_press) { - const InputEventScreenDrag *sd = p_event->cast_to(); + const InputEventScreenDrag *sd = Object::cast_to(*p_event); if (st && !st->is_pressed() && finger_pressed == st->get_index()) { -- cgit v1.3.1