summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-07-07 14:30:15 (GMT)
committerTobias Markmann <tm@ayena.de>2015-07-10 12:02:28 (GMT)
commita23d903d67f05257f0e9376a212b83045ea768f1 (patch)
tree9305d52cd02cb33bd2c209705ea2c98b55c93a43 /Swiften/FileTransfer
parent8867a5e938bcfd9ddb55830373dd46b45daca1d9 (diff)
downloadswift-a23d903d67f05257f0e9376a212b83045ea768f1.zip
swift-a23d903d67f05257f0e9376a212b83045ea768f1.tar.bz2
Fix memory leaks reported by memcheck (Valgrind) in Jingle FT Tests
Test-Information: Detected with valgrind-3.10.1 on OS X 10.9.5 and verified they are gone with this fix. Change-Id: I8cab09efd2227a8d43fa77bd2c315bd9b67435fb
Diffstat (limited to 'Swiften/FileTransfer')
-rw-r--r--Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp11
-rw-r--r--Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp6
2 files changed, 9 insertions, 8 deletions
diff --git a/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp b/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp
index 54d2c88..2fb39bb 100644
--- a/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp
+++ b/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp
@@ -89,15 +89,16 @@ public:
void tearDown() {
delete ftTransporterFactory;
- delete networkEnvironment;
- delete natTraverser;
- delete bytestreamServerManager;
delete bytestreamProxy;
- delete serverConnectionFactory;
- delete connectionFactory;
delete timerFactory;
+ delete idGenerator;
+ delete bytestreamServerManager;
+ delete natTraverser;
+ delete networkEnvironment;
delete bytestreamRegistry;
delete iqRouter;
+ delete serverConnectionFactory;
+ delete connectionFactory;
delete stanzaChannel;
delete resolver;
delete eventLoop;
diff --git a/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp b/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp
index 4b2fb50..f3fe42e 100644
--- a/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp
+++ b/Swiften/FileTransfer/UnitTest/OutgoingJingleFileTransferTest.cpp
@@ -135,11 +135,11 @@ public:
void tearDown() {
delete ftTransportFactory;
- delete networkEnvironment;
- delete natTraverser;
- delete bytestreamServerManager;
delete s5bProxy;
delete idGen;
+ delete bytestreamServerManager;
+ delete natTraverser;
+ delete networkEnvironment;
delete s5bRegistry;
delete serverConnectionFactory;
delete connectionFactory;