Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-08-01 15:14:41 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-08-01 17:15:43 (GMT) |
| commit | 9776bbeb1b31e651e8f2a0c9c102b6440dd1ff20 (patch) | |
| tree | ecb5ada12da472ec89ff2595e4fa08119d4d2349 | |
| parent | bf506a6670fc21f6f84a8303c540e49f5edb65fb (diff) | |
| download | swift-contrib-9776bbeb1b31e651e8f2a0c9c102b6440dd1ff20.zip swift-contrib-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.cpp | 1 | ||||
| -rw-r--r-- | Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp | 4 | ||||
| -rw-r--r-- | Swift/Controllers/UnitTest/PreviousStatusStoreTest.cpp | 2 |
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 @@ -48,18 +48,19 @@ ChatControllerBase::ChatControllerBase(const JID& self, StanzaChannel* stanzaCha chatWindow_->onSendMessageRequest.connect(boost::bind(&ChatControllerBase::handleSendMessageRequest, this, _1, _2)); chatWindow_->onLogCleared.connect(boost::bind(&ChatControllerBase::handleLogCleared, this)); entityCapsProvider_->onCapsChanged.connect(boost::bind(&ChatControllerBase::handleCapsChanged, this, _1)); highlighter_ = highlightManager->createHighlighter(); setOnline(stanzaChannel->isAvailable() && iqRouter->isAvailable()); createDayChangeTimer(); } ChatControllerBase::~ChatControllerBase() { + delete highlighter_; delete chatWindow_; } void ChatControllerBase::handleLogCleared() { cancelReplaces(); } ChatWindow* ChatControllerBase::detachChatWindow() { ChatWindow* chatWindow = 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 @@ -95,21 +95,23 @@ class RosterControllerTest : public CppUnit::TestFixture { mainWindow_ = mainWindowFactory_->last; } void tearDown() { delete rosterController_; delete vcardManager_; delete vcardStorage_; delete crypto_; delete clientBlockListManager_; + delete ftOverview_; delete ftManager_; delete jingleSessionManager_; - + delete entityCapsManager_; + delete capsProvider_; delete nickManager_; delete nickResolver_; delete mucRegistry_; delete mainWindowFactory_; delete avatarManager_; delete router_; delete channel_; delete eventController_; delete subscriptionManager_; 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 @@ -24,19 +24,19 @@ public: store_ = new PreviousStatusStore(); store_->addStatus(StatusShow::Online, "At home in the study"); store_->addStatus(StatusShow::DND, "In a meeting"); store_->addStatus(StatusShow::DND, "With a client"); store_->addStatus(StatusShow::Away, "Walking the elephant"); store_->addStatus(StatusShow::Online, "In the office, at my desk"); } void tearDown() { - + delete store_; } void testGetAll() { } private: PreviousStatusStore* store_; }; |