diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2017-08-24 22:58:51 +0200 |
|---|---|---|
| committer | Hein-Pieter van Braam <hp@tmm.cx> | 2017-08-24 23:08:24 +0200 |
| commit | cacced7e507f7603bacc03ae2616e58f0ede122a (patch) | |
| tree | 7af89373e86cd1a7af6ea04e10280084cabb7144 /servers | |
| parent | 4aa2c18cb428ffde05c67987926736a9ca62703b (diff) | |
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/
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/audio_server.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<AudioEffectInstance> fx = buses[p_bus]->effects[j].effect->instance(); - if (fx->cast_to<AudioEffectCompressorInstance>()) { - fx->cast_to<AudioEffectCompressorInstance>()->set_current_channel(i); + if (Object::cast_to<AudioEffectCompressorInstance>(*fx)) { + Object::cast_to<AudioEffectCompressorInstance>(*fx)->set_current_channel(i); } buses[p_bus]->channels[i].effect_instances[j] = fx; } |