summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2014-08-01 15:14:41 (GMT)
committerTobias Markmann <tm@ayena.de>2014-08-01 17:15:43 (GMT)
commit9776bbeb1b31e651e8f2a0c9c102b6440dd1ff20 (patch)
treeecb5ada12da472ec89ff2595e4fa08119d4d2349
parentbf506a6670fc21f6f84a8303c540e49f5edb65fb (diff)
downloadswift-9776bbeb1b31e651e8f2a0c9c102b6440dd1ff20.zip
swift-9776bbeb1b31e651e8f2a0c9c102b6440dd1ff20.tar.bz2
Fix memory leaks reported by ASAN in some unit tests.
Change-Id: Ic9c31a8e2378110df7f368437b66ff4b51cfd665 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
-rw-r--r--Swift/Controllers/Chat/ChatControllerBase.cpp1
-rw-r--r--Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp4
-rw-r--r--Swift/Controllers/UnitTest/PreviousStatusStoreTest.cpp2
3 files changed, 5 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp
index 519deda..2c2540c 100644
--- a/Swift/Controllers/Chat/ChatControllerBase.cpp
+++ b/Swift/Controllers/Chat/ChatControllerBase.cpp
@@ -54,6 +54,7 @@ ChatControllerBase::ChatControllerBase(const JID& self, StanzaChannel* stanzaCha
}
ChatControllerBase::~ChatControllerBase() {
+ delete highlighter_;
delete chatWindow_;
}
diff --git a/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
index a81d587..392a426 100644
--- a/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
@@ -101,9 +101,11 @@ class RosterControllerTest : public CppUnit::TestFixture {
delete vcardStorage_;
delete crypto_;
delete clientBlockListManager_;
+ delete ftOverview_;
delete ftManager_;
delete jingleSessionManager_;
-
+ delete entityCapsManager_;
+ delete capsProvider_;
delete nickManager_;
delete nickResolver_;
delete mucRegistry_;
diff --git a/Swift/Controllers/UnitTest/PreviousStatusStoreTest.cpp b/Swift/Controllers/UnitTest/PreviousStatusStoreTest.cpp
index 9489e5b..0ccbc4a 100644
--- a/Swift/Controllers/UnitTest/PreviousStatusStoreTest.cpp
+++ b/Swift/Controllers/UnitTest/PreviousStatusStoreTest.cpp
@@ -30,7 +30,7 @@ public:
}
void tearDown() {
-
+ delete store_;
}
void testGetAll() {