diff options
author | Rubidium <rubidium@openttd.org> | 2021-05-12 19:44:00 +0200 |
---|---|---|
committer | rubidium42 <rubidium42@users.noreply.github.com> | 2021-05-13 10:03:26 +0200 |
commit | 7755f81bb8ba1c6a47e3a528acbbc462e56adaff (patch) | |
tree | aff19b5894e3a5546e43f610ca6a3c0a9e154c8d /src/fontcache.cpp | |
parent | d7ce61f10674567c97a1edd78ea1baf4e08153f2 (diff) | |
download | openttd-7755f81bb8ba1c6a47e3a528acbbc462e56adaff.tar.xz |
Codechange: make explicit that virtual functions in a con/destructor are resolved statically
This as during construction the sub class has not been initialized yet, and
during destruction the sub class has already been destroyed, so the overriding
virtual function would be accessing uninitialized data.
Diffstat (limited to 'src/fontcache.cpp')
-rw-r--r-- | src/fontcache.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/fontcache.cpp b/src/fontcache.cpp index ce15233b7..530dc7cf8 100644 --- a/src/fontcache.cpp +++ b/src/fontcache.cpp @@ -216,7 +216,8 @@ TrueTypeFontCache::TrueTypeFontCache(FontSize fs, int pixels) : FontCache(fs), r */ TrueTypeFontCache::~TrueTypeFontCache() { - this->ClearFontCache(); + /* Virtual functions get called statically in destructors, so make it explicit to remove any confusion. */ + this->TrueTypeFontCache::ClearFontCache(); for (auto &iter : this->font_tables) { free(iter.second.second); |