Browse Source

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 <rgetz503@gmail.com>
chirpmodem-v8.0.0
Robin Getz 3 months ago
parent
commit
63df6dc04e
No known key found for this signature in database
GPG Key ID: 51C7231FFED0E060
  1. 17
      sdrbase/util/osndb.cpp
  2. 2
      sdrbase/util/osndb.h

17
sdrbase/util/osndb.cpp

@ -53,6 +53,8 @@ OsnDB::OsnDB(QObject *parent) : @@ -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) @@ -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();
}

2
sdrbase/util/osndb.h

@ -85,6 +85,8 @@ struct SDRBASE_API AircraftInformation { @@ -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);

Loading…
Cancel
Save