From 525102130f7bc274a23c9a342c5ad2e3e857df96 Mon Sep 17 00:00:00 2001
From: kh1 <karsten.heimrich@digia.com>
Date: Wed, 13 Mar 2013 16:41:07 +0100
Subject: Fix some small memory leaks.

Change-Id: Ifb18ba7c3d83ac9cde7adf571625b13e876efd8e
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
 src/libs/installer/packagemanagercore.cpp | 4 ++++
 src/libs/installer/productkeycheck.cpp    | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 7d59dddec..6b6009ac2 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -550,6 +550,10 @@ PackageManagerCore::~PackageManagerCore()
         QInstaller::VerboseWriter::instance()->setOutputStream(logFileName);
     }
     delete d;
+
+    QMutexLocker _(&sVirtualComponentsFontMutex);
+    delete sVirtualComponentsFont;
+    sVirtualComponentsFont = 0;
 }
 
 /* static */
diff --git a/src/libs/installer/productkeycheck.cpp b/src/libs/installer/productkeycheck.cpp
index f975db821..120014dad 100644
--- a/src/libs/installer/productkeycheck.cpp
+++ b/src/libs/installer/productkeycheck.cpp
@@ -47,10 +47,8 @@ ProductKeyCheck::~ProductKeyCheck()
 
 ProductKeyCheck *ProductKeyCheck::instance()
 {
-    static ProductKeyCheck *instance = 0;
-    if (instance == 0)
-        instance = new ProductKeyCheck();
-    return instance;
+    static ProductKeyCheck instance;
+    return &instance;
 }
 
 bool ProductKeyCheck::hasValidKey()
-- 
cgit v1.2.3