Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-06-30 07:02:01 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-07-07 19:58:12 (GMT) |
| commit | 799a7ac203dc2576872894dfdd1adb5cdbbacf7b (patch) | |
| tree | e0242decf49222b83674143cf04f61c3dc01bc35 /Swiften/FileTransfer/IncomingJingleFileTransfer.cpp | |
| parent | abd96284e162b3594bd0fc90a5da6b78709dee23 (diff) | |
| download | swift-799a7ac203dc2576872894dfdd1adb5cdbbacf7b.zip swift-799a7ac203dc2576872894dfdd1adb5cdbbacf7b.tar.bz2 | |
Fix memory leaks reported by ASAN
Test-Information:
Tested on Elementary OS with a LLVM/Clang 3.7.0 build. With this patch
the reports for the fixed locations are gone.
Change-Id: I0260fc85ad662335a69ace331f51ebe2f864ef97
Diffstat (limited to 'Swiften/FileTransfer/IncomingJingleFileTransfer.cpp')
| -rw-r--r-- | Swiften/FileTransfer/IncomingJingleFileTransfer.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp index 877b2fd..39da46f 100644 --- a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp +++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp | |||
| @@ -12,20 +12,20 @@ | |||
| 12 | #include <boost/smart_ptr/make_shared.hpp> | 12 | #include <boost/smart_ptr/make_shared.hpp> |
| 13 | 13 | ||
| 14 | #include <Swiften/Base/Log.h> | 14 | #include <Swiften/Base/Log.h> |
| 15 | #include <Swiften/StringCodecs/Base64.h> | ||
| 16 | #include <Swiften/Base/foreach.h> | 15 | #include <Swiften/Base/foreach.h> |
| 17 | #include <Swiften/Jingle/JingleSession.h> | 16 | #include <Swiften/Elements/JingleFileTransferDescription.h> |
| 17 | #include <Swiften/Elements/JingleFileTransferHash.h> | ||
| 18 | #include <Swiften/Elements/JingleIBBTransportPayload.h> | 18 | #include <Swiften/Elements/JingleIBBTransportPayload.h> |
| 19 | #include <Swiften/Elements/JingleS5BTransportPayload.h> | 19 | #include <Swiften/Elements/JingleS5BTransportPayload.h> |
| 20 | #include <Swiften/Elements/JingleFileTransferHash.h> | ||
| 21 | #include <Swiften/FileTransfer/IncrementalBytestreamHashCalculator.h> | ||
| 22 | #include <Swiften/FileTransfer/FileTransferTransporter.h> | 20 | #include <Swiften/FileTransfer/FileTransferTransporter.h> |
| 23 | #include <Swiften/FileTransfer/FileTransferTransporterFactory.h> | 21 | #include <Swiften/FileTransfer/FileTransferTransporterFactory.h> |
| 22 | #include <Swiften/FileTransfer/IncrementalBytestreamHashCalculator.h> | ||
| 23 | #include <Swiften/FileTransfer/TransportSession.h> | ||
| 24 | #include <Swiften/FileTransfer/WriteBytestream.h> | 24 | #include <Swiften/FileTransfer/WriteBytestream.h> |
| 25 | #include <Swiften/Elements/JingleFileTransferDescription.h> | 25 | #include <Swiften/Jingle/JingleSession.h> |
| 26 | #include <Swiften/Network/TimerFactory.h> | 26 | #include <Swiften/Network/TimerFactory.h> |
| 27 | #include <Swiften/Queries/GenericRequest.h> | 27 | #include <Swiften/Queries/GenericRequest.h> |
| 28 | #include <Swiften/FileTransfer/TransportSession.h> | 28 | #include <Swiften/StringCodecs/Base64.h> |
| 29 | 29 | ||
| 30 | using namespace Swift; | 30 | using namespace Swift; |
| 31 | 31 | ||
| @@ -56,6 +56,8 @@ IncomingJingleFileTransfer::IncomingJingleFileTransfer( | |||
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | IncomingJingleFileTransfer::~IncomingJingleFileTransfer() { | 58 | IncomingJingleFileTransfer::~IncomingJingleFileTransfer() { |
| 59 | delete hashCalculator; | ||
| 60 | hashCalculator = NULL; | ||
| 59 | } | 61 | } |
| 60 | 62 | ||
| 61 | void IncomingJingleFileTransfer::accept( | 63 | void IncomingJingleFileTransfer::accept( |
| @@ -334,8 +336,7 @@ void IncomingJingleFileTransfer::stopAll() { | |||
| 334 | case Finished: SWIFT_LOG(warning) << "Already finished" << std::endl; break; | 336 | case Finished: SWIFT_LOG(warning) << "Already finished" << std::endl; break; |
| 335 | } | 337 | } |
| 336 | if (state != Initial) { | 338 | if (state != Initial) { |
| 337 | delete transporter; | 339 | removeTransporter(); |
| 338 | transporter = NULL; | ||
| 339 | } | 340 | } |
| 340 | } | 341 | } |
| 341 | 342 | ||