diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2021-08-15 00:36:19 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-17 13:07:54 +0000 |
| commit | 77cd2c7951eb7ef9df707b46967e9de84508c436 (patch) | |
| tree | 2c49a21983ebc166596fca74ea9b5afcfd5ca1ab | |
| parent | beb28f1b431899e10fa05a2195fdc86ae749fb9c (diff) | |
| download | qtapplicationmanager-77cd2c7951eb7ef9df707b46967e9de84508c436.tar.gz | |
Clazy: fix potential crashes
Change-Id: Idb99f9d668850486afa49164bbcfe906efd50caf
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit d92730320d4e6af4c7c839ff1b941870b6d5ab14)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/manager-lib/package.cpp | 6 | ||||
| -rw-r--r-- | src/manager-lib/packagemanager.cpp | 3 | ||||
| -rw-r--r-- | src/notification-lib/notification.cpp | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/manager-lib/package.cpp b/src/manager-lib/package.cpp index dc10ded5..fceff075 100644 --- a/src/manager-lib/package.cpp +++ b/src/manager-lib/package.cpp @@ -217,7 +217,8 @@ QString Package::name() const QVariantMap Package::names() const { QVariantMap names; - for (auto it = info()->names().cbegin(); it != info()->names().cend(); ++it) + const auto nmap = info()->names(); + for (auto it = nmap.cbegin(); it != nmap.cend(); ++it) names.insert(it.key(), it.value()); return names; } @@ -240,7 +241,8 @@ QString Package::description() const QVariantMap Package::descriptions() const { QVariantMap descriptions; - for (auto it = info()->descriptions().cbegin(); it != info()->descriptions().cend(); ++it) + const auto dmap = info()->descriptions(); + for (auto it = dmap.cbegin(); it != dmap.cend(); ++it) descriptions.insert(it.key(), it.value()); return descriptions; } diff --git a/src/manager-lib/packagemanager.cpp b/src/manager-lib/packagemanager.cpp index 23815c70..a88eb7a9 100644 --- a/src/manager-lib/packagemanager.cpp +++ b/src/manager-lib/packagemanager.cpp @@ -1455,10 +1455,11 @@ bool PackageManager::finishedPackageInstall(const QString &id) // cleanup package->unblock(); - delete package; // remove the package from the package db d->database->removePackageInfo(package->info()); + + delete package; break; } } diff --git a/src/notification-lib/notification.cpp b/src/notification-lib/notification.cpp index 5813ac82..665ea565 100644 --- a/src/notification-lib/notification.cpp +++ b/src/notification-lib/notification.cpp @@ -87,7 +87,7 @@ Notification::Notification(QObject *parent, Notification::ConstructionMode mode) : QObject(parent) { if (mode == Dynamic) - componentComplete(); + Notification::componentComplete(); } /*! |