Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2013-10-04 22:52:27 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2013-10-04 23:03:52 (GMT) |
| commit | 1e68d4dffd81e69e2ff740fdf249a696f05e0544 (patch) | |
| tree | 0e96091aa9ec8b2b28860a9dffb4b059f2391b27 | |
| parent | ec8adadffe97fe4c19567bb71f25b702e99770a1 (diff) | |
| download | swift-1e68d4dffd81e69e2ff740fdf249a696f05e0544.zip swift-1e68d4dffd81e69e2ff740fdf249a696f05e0544.tar.bz2 | |
Fix heap-use-after-free bugs reported by asan.
One only showed in netbook-mode. Another got introduced by the impromptu patch.
Change-Id: Id878d001b6bac67f943a86386300c8a0db3bc74e
License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
| -rw-r--r-- | Swift/QtUI/QtSwift.cpp | 2 | ||||
| -rw-r--r-- | Swiften/MUC/MUC.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index e84f9cf..183f64d 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -251,10 +251,10 @@ QtSwift::~QtSwift() { delete tray; } delete tabs_; + delete splitter_; delete settingsHierachy_; delete qtSettings_; delete xmlSettings_; - delete splitter_; delete statusCache_; delete uriHandler_; delete dock_; diff --git a/Swiften/MUC/MUC.cpp b/Swiften/MUC/MUC.cpp index ff26c86..f85cf8d 100644 --- a/Swiften/MUC/MUC.cpp +++ b/Swiften/MUC/MUC.cpp @@ -175,8 +175,8 @@ void MUC::handleIncomingPresence(Presence::ref presence) { std::map<std::string,MUCOccupant>::iterator i = occupants.find(nick); if (i != occupants.end()) { //TODO: part type - occupants.erase(i); MUCOccupant occupant = i->second; + occupants.erase(i); onOccupantLeft(occupant, type, ""); } } |