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/resources/theme.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'scene/resources/theme.cpp') diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index ac1bb105a..c2c7c3776 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -1030,14 +1030,13 @@ RES ResourceFormatLoaderTheme::load(const String &p_path, const String &p_origin ERR_FAIL_V(RES()); } - if (res->cast_to()) { - + if (Object::cast_to(*res)) { theme->set_stylebox(item, control, res); - } else if (res->cast_to()) { + } else if (Object::cast_to(*res)) { theme->set_font(item, control, res); - } else if (res->cast_to()) { + } else if (Object::cast_to(*res)) { theme->set_font(item, control, res); - } else if (res->cast_to()) { + } else if (Object::cast_to(*res)) { theme->set_icon(item, control, res); } else { memdelete(f); -- cgit v1.3.1