Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-03-08 16:22:02 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-05-01 17:36:17 (GMT) |
| commit | 08f08513e636a8eb36645fdd712105156a754ae2 (patch) | |
| tree | 53eb638fa47cb3a58f8c4f3ef3ab88a4e2b77ad6 /Swiften/FileTransfer | |
| parent | f9dcd7a6e81e6c244e111aa1a22992f0604d999c (diff) | |
| download | swift-08f08513e636a8eb36645fdd712105156a754ae2.zip swift-08f08513e636a8eb36645fdd712105156a754ae2.tar.bz2 | |
Fix hash verification in Jingle FT to only verify one hash algorithm
This also adds missing resets pointers to NULL after they are deleted.
Test-Information:
FileTransferTest crashed in some scenarios before; now it always runs
successful.
Change-Id: Ic63fd51eeb46e708221a04dc912e8bf2f1d4f9fb
Diffstat (limited to 'Swiften/FileTransfer')
| -rw-r--r-- | Swiften/FileTransfer/IncomingJingleFileTransfer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp index a0cd47c..98ad4d3 100644 --- a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp +++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp @@ -137,13 +137,13 @@ void IncomingJingleFileTransfer::handleSessionInfoReceived(JinglePayload::ref ji if (transferHash) { SWIFT_LOG(debug) << "Received hash information." << std::endl; waitOnHashTimer->stop(); if (transferHash->getFileInfo().getHashes().find("sha-1") != transferHash->getFileInfo().getHashes().end()) { hashes["sha-1"] = transferHash->getFileInfo().getHash("sha-1").get(); } - else if (transferHash->getFileInfo().getHashes().find("md5") != transferHash->getFileInfo().getHashes().end()) { + if (transferHash->getFileInfo().getHashes().find("md5") != transferHash->getFileInfo().getHashes().end()) { hashes["md5"] = transferHash->getFileInfo().getHash("md5").get(); } if (state == WaitingForHash) { checkHashAndTerminate(); } } @@ -183,15 +183,15 @@ void IncomingJingleFileTransfer::checkHashAndTerminate() { } } void IncomingJingleFileTransfer::checkIfAllDataReceived() { if (receivedBytes == getFileSizeInBytes()) { SWIFT_LOG(debug) << "All data received." << std::endl; - bool hashInfoAvailable = true; + bool hashInfoAvailable = false; foreach(const JingleFileTransferFileInfo::HashElementMap::value_type& hashElement, hashes) { - hashInfoAvailable &= !hashElement.second.empty(); + hashInfoAvailable |= !hashElement.second.empty(); } if (!hashInfoAvailable) { SWIFT_LOG(debug) << "No hash information yet. Waiting a while on hash info." << std::endl; setState(WaitingForHash); waitOnHashTimer->start(); @@ -311,12 +311,13 @@ FileTransfer::State::Type IncomingJingleFileTransfer::getExternalState(State sta } void IncomingJingleFileTransfer::stopAll() { if (state != Initial) { writeStreamDataReceivedConnection.disconnect(); delete hashCalculator; + hashCalculator = NULL; } switch (state) { case Initial: break; case GeneratingInitialLocalCandidates: transporter->stopGeneratingLocalCandidates(); break; case TryingCandidates: transporter->stopTryingRemoteCandidates(); break; case WaitingForFallbackOrTerminate: break; @@ -330,12 +331,13 @@ void IncomingJingleFileTransfer::stopAll() { transportSession.reset(); break; case Finished: SWIFT_LOG(warning) << "Already finished" << std::endl; break; } if (state != Initial) { delete transporter; + transporter = NULL; } } bool IncomingJingleFileTransfer::hasPriorityOnCandidateTie() const { return false; } |