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/ --- servers/audio_server.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'servers') diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index f9fdd9432d..903e831399 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -654,8 +654,8 @@ void AudioServer::_update_bus_effects(int p_bus) { buses[p_bus]->channels[i].effect_instances.resize(buses[p_bus]->effects.size()); for (int j = 0; j < buses[p_bus]->effects.size(); j++) { Ref fx = buses[p_bus]->effects[j].effect->instance(); - if (fx->cast_to()) { - fx->cast_to()->set_current_channel(i); + if (Object::cast_to(*fx)) { + Object::cast_to(*fx)->set_current_channel(i); } buses[p_bus]->channels[i].effect_instances[j] = fx; } -- cgit v1.2.3