summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2013-09-09 16:18:12 (GMT)
committerSwift Review <review@swift.im>2013-09-16 17:46:50 (GMT)
commitb1d6c4a6f8aaedcb69ed111dff87cba87ccc96cc (patch)
tree71919534883ced922c35bae986562daa8855f5bd
parent4b618b1922e531299aafcdf4dc6ef8782de1ee46 (diff)
downloadswift-contrib-b1d6c4a6f8aaedcb69ed111dff87cba87ccc96cc.zip
swift-contrib-b1d6c4a6f8aaedcb69ed111dff87cba87ccc96cc.tar.bz2
Fix heap-use-after-free bug reported by asan.
Change-Id: I891333b992d08b83cd4127bfd0893399735b5432 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
-rw-r--r--Swift/QtUI/QtSwift.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index 4d4cef9..e84f9cf 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -247,13 +247,13 @@ QtSwift::~QtSwift() {
delete controller;
}
delete notifier_;
- delete settingsHierachy_;
- delete qtSettings_;
- delete xmlSettings_;
foreach (QtSystemTray* tray, systemTrays_) {
delete tray;
}
delete tabs_;
+ delete settingsHierachy_;
+ delete qtSettings_;
+ delete xmlSettings_;
delete splitter_;
delete statusCache_;
delete uriHandler_;