From 63df6dc04e085424a338b4df69739d4689c4e62d Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Thu, 3 Sep 2026 22:51:27 -0400 Subject: [PATCH] util/osndb: Clean up cached aircraft information icons ASAN reported leaked flag and airline icons when OsnDB was destroyed. Add cleanup functions and release the cached icons during destruction. This ensures cached icon resources do not outlive the OsnDB instance. Signed-off-by: Robin Getz --- sdrbase/util/osndb.cpp | 17 +++++++++++++++++ sdrbase/util/osndb.h | 2 ++ 2 files changed, 19 insertions(+) diff --git a/sdrbase/util/osndb.cpp b/sdrbase/util/osndb.cpp index e4a1214db..3aedfd819 100644 --- a/sdrbase/util/osndb.cpp +++ b/sdrbase/util/osndb.cpp @@ -53,6 +53,8 @@ OsnDB::OsnDB(QObject *parent) : OsnDB::~OsnDB() { disconnect(&m_dlm, &HttpDownloadManager::downloadComplete, this, &OsnDB::downloadFinished); + AircraftInformation::cleanupFlagIcons(); + AircraftInformation::cleanupAirlineIcons(); } void OsnDB::downloadAircraftInformation() @@ -731,3 +733,18 @@ QIcon *AircraftInformation::getFlagIcon(const QString &country) } } +void AircraftInformation::cleanupFlagIcons() +{ + for (auto icon : m_flagIcons) { + delete icon; + } + m_flagIcons.clear(); +} + +void AircraftInformation::cleanupAirlineIcons() +{ + for (auto icon : m_airlineIcons) { + delete icon; + } + m_airlineIcons.clear(); +} diff --git a/sdrbase/util/osndb.h b/sdrbase/util/osndb.h index 2919090d5..00aa3dfbb 100644 --- a/sdrbase/util/osndb.h +++ b/sdrbase/util/osndb.h @@ -85,6 +85,8 @@ struct SDRBASE_API AircraftInformation { // Try to find an flag logo based on a country static QIcon *getFlagIcon(const QString &country); + static void cleanupFlagIcons(); + static void cleanupAirlineIcons(); static QString resourcePathToURL(const QString &path);