Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-07-17 08:18:04 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-07-20 11:24:07 (GMT) |
| commit | f10bd4cc1f570b27943d27e536d1dcfbcd55ec6a (patch) | |
| tree | eaa855d6b961ea70c854db571ace7127a36f9d8c /Swiften/Client/Client.cpp | |
| parent | 3e982c0a39d1d1833afaf558fc7b0f7aeffd2d64 (diff) | |
| download | swift-f10bd4cc1f570b27943d27e536d1dcfbcd55ec6a.zip swift-f10bd4cc1f570b27943d27e536d1dcfbcd55ec6a.tar.bz2 | |
Do not reallocate FileTransferManager on connect of Clientswift-3.0beta2
Now Client allocates a FileTransferManager in its ctor and frees
it in its dtor, like all the other resources of the Client class.
This fixes an ASAN crash in the use case where you do a file
transfer, go offline and online again and try to start another
file transfer.
Test-Information:
Tested that the mentioned use case does not crash anymore,
that file transfers still work, and that FileTransferTest still
passes.
Change-Id: Iddbcd8522af7df528bdc2b030fe616ad3f0c4701
Diffstat (limited to 'Swiften/Client/Client.cpp')
| -rw-r--r-- | Swiften/Client/Client.cpp | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp index 613249b..3bfdd3f 100644 --- a/Swiften/Client/Client.cpp +++ b/Swiften/Client/Client.cpp | |||
| @@ -69,18 +69,35 @@ Client::Client(const JID& jid, const SafeString& password, NetworkFactories* net | |||
| 69 | 69 | ||
| 70 | blindCertificateTrustChecker = new BlindCertificateTrustChecker(); | 70 | blindCertificateTrustChecker = new BlindCertificateTrustChecker(); |
| 71 | 71 | ||
| 72 | jingleSessionManager = new JingleSessionManager(getIQRouter()); | 72 | jingleSessionManager = new JingleSessionManager(getIQRouter()); |
| 73 | blockListManager = new ClientBlockListManager(getIQRouter()); | 73 | blockListManager = new ClientBlockListManager(getIQRouter()); |
| 74 | fileTransferManager = NULL; | ||
| 75 | 74 | ||
| 76 | whiteboardSessionManager = NULL; | 75 | whiteboardSessionManager = NULL; |
| 77 | #ifdef SWIFT_EXPERIMENTAL_WB | 76 | #ifdef SWIFT_EXPERIMENTAL_WB |
| 78 | whiteboardSessionManager = new WhiteboardSessionManager(getIQRouter(), getStanzaChannel(), presenceOracle, getEntityCapsProvider()); | 77 | whiteboardSessionManager = new WhiteboardSessionManager(getIQRouter(), getStanzaChannel(), presenceOracle, getEntityCapsProvider()); |
| 79 | #endif | 78 | #endif |
| 80 | 79 | ||
| 81 | pubsubManager = new PubSubManagerImpl(getStanzaChannel(), getIQRouter()); | 80 | pubsubManager = new PubSubManagerImpl(getStanzaChannel(), getIQRouter()); |
| 81 | |||
| 82 | #ifdef SWIFT_EXPERIMENTAL_FT | ||
| 83 | fileTransferManager = new FileTransferManagerImpl( | ||
| 84 | getJID(), | ||
| 85 | jingleSessionManager, | ||
| 86 | getIQRouter(), | ||
| 87 | getEntityCapsProvider(), | ||
| 88 | presenceOracle, | ||
| 89 | getNetworkFactories()->getConnectionFactory(), | ||
| 90 | getNetworkFactories()->getConnectionServerFactory(), | ||
| 91 | getNetworkFactories()->getTimerFactory(), | ||
| 92 | getNetworkFactories()->getDomainNameResolver(), | ||
| 93 | getNetworkFactories()->getNetworkEnvironment(), | ||
| 94 | getNetworkFactories()->getNATTraverser(), | ||
| 95 | getNetworkFactories()->getCryptoProvider()); | ||
| 96 | #else | ||
| 97 | fileTransferManager = new DummyFileTransferManager(); | ||
| 98 | #endif | ||
| 82 | } | 99 | } |
| 83 | 100 | ||
| 84 | Client::~Client() { | 101 | Client::~Client() { |
| 85 | delete pubsubManager; | 102 | delete pubsubManager; |
| 86 | delete whiteboardSessionManager; | 103 | delete whiteboardSessionManager; |
| @@ -124,28 +141,10 @@ XMPPRoster* Client::getRoster() const { | |||
| 124 | void Client::setSoftwareVersion(const std::string& name, const std::string& version, const std::string& os) { | 141 | void Client::setSoftwareVersion(const std::string& name, const std::string& version, const std::string& os) { |
| 125 | softwareVersionResponder->setVersion(name, version, os); | 142 | softwareVersionResponder->setVersion(name, version, os); |
| 126 | } | 143 | } |
| 127 | 144 | ||
| 128 | void Client::handleConnected() { | 145 | void Client::handleConnected() { |
| 129 | delete fileTransferManager; | ||
| 130 | #ifdef SWIFT_EXPERIMENTAL_FT | ||
| 131 | fileTransferManager = new FileTransferManagerImpl( | ||
| 132 | getJID(), | ||
| 133 | jingleSessionManager, | ||
| 134 | getIQRouter(), | ||
| 135 | getEntityCapsProvider(), | ||
| 136 | presenceOracle, | ||
| 137 | getNetworkFactories()->getConnectionFactory(), | ||
| 138 | getNetworkFactories()->getConnectionServerFactory(), | ||
| 139 | getNetworkFactories()->getTimerFactory(), | ||
| 140 | getNetworkFactories()->getDomainNameResolver(), | ||
| 141 | getNetworkFactories()->getNetworkEnvironment(), | ||
| 142 | getNetworkFactories()->getNATTraverser(), | ||
| 143 | getNetworkFactories()->getCryptoProvider()); | ||
| 144 | #else | ||
| 145 | fileTransferManager = new DummyFileTransferManager(); | ||
| 146 | #endif | ||
| 147 | discoManager->handleConnected(); | 146 | discoManager->handleConnected(); |
| 148 | } | 147 | } |
| 149 | 148 | ||
| 150 | void Client::requestRoster() { | 149 | void Client::requestRoster() { |
| 151 | // FIXME: We should set this once when the session is finished, but there | 150 | // FIXME: We should set this once when the session is finished, but there |