Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-07-21 16:30:15 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2015-07-21 16:42:34 (GMT) |
| commit | 6ca201d0b48f4273e24dd7bff17c4a46eeaddf39 (patch) | |
| tree | ace238716521c89a54168472905379a9249c3666 /Swiften/Network/ChainedConnector.h | |
| parent | 02ecf91d261276ec6f1e46b537ac0e10ebae3170 (diff) | |
| download | swift-6ca201d0b48f4273e24dd7bff17c4a46eeaddf39.zip swift-6ca201d0b48f4273e24dd7bff17c4a46eeaddf39.tar.bz2 | |
Explicitly disconnect from remaining resources in destructors
Explicitly disconnect from remaining resources in the
ChainedConnected and ClientSessionStanzaChannel destructors, so
the event loop will not call the signal handler methods on a
freed object.
Test-Information:
Repeating the test case of creating a Swift::Client instance,
connecting it and then deleting it after a random time below one
second.
On Mac OS X 10.9.5 running this test case causes two ASAN
heap-use-after-free errors and with this patch the errors are
gone.
Change-Id: I3e48150c3633f4076ca9172aad9e85ba389df950
Diffstat (limited to 'Swiften/Network/ChainedConnector.h')
| -rw-r--r-- | Swiften/Network/ChainedConnector.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Swiften/Network/ChainedConnector.h b/Swiften/Network/ChainedConnector.h index 77fa6fd..9bcc961 100644 --- a/Swiften/Network/ChainedConnector.h +++ b/Swiften/Network/ChainedConnector.h | |||
| @@ -1,22 +1,23 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2011 Isode Limited. | 2 | * Copyright (c) 2011-2015 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #pragma once | 7 | #pragma once |
| 8 | 8 | ||
| 9 | #include <deque> | ||
| 9 | #include <string> | 10 | #include <string> |
| 10 | #include <vector> | 11 | #include <vector> |
| 11 | #include <deque> | 12 | |
| 12 | #include <boost/shared_ptr.hpp> | ||
| 13 | #include <boost/optional.hpp> | 13 | #include <boost/optional.hpp> |
| 14 | #include <boost/shared_ptr.hpp> | ||
| 14 | 15 | ||
| 15 | #include <Swiften/Base/API.h> | 16 | #include <Swiften/Base/API.h> |
| 16 | #include <Swiften/Base/boost_bsignals.h> | ||
| 17 | #include <Swiften/Base/Error.h> | 17 | #include <Swiften/Base/Error.h> |
| 18 | #include <Swiften/Base/boost_bsignals.h> | ||
| 18 | 19 | ||
| 19 | namespace Swift { | 20 | namespace Swift { |
| 20 | class Connection; | 21 | class Connection; |
| 21 | class Connector; | 22 | class Connector; |
| 22 | class ConnectionFactory; | 23 | class ConnectionFactory; |
| @@ -24,10 +25,11 @@ namespace Swift { | |||
| 24 | class DomainNameResolver; | 25 | class DomainNameResolver; |
| 25 | 26 | ||
| 26 | class SWIFTEN_API ChainedConnector { | 27 | class SWIFTEN_API ChainedConnector { |
| 27 | public: | 28 | public: |
| 28 | ChainedConnector(const std::string& hostname, int port, const boost::optional<std::string>& serviceLookupPrefix, DomainNameResolver*, const std::vector<ConnectionFactory*>&, TimerFactory*); | 29 | ChainedConnector(const std::string& hostname, int port, const boost::optional<std::string>& serviceLookupPrefix, DomainNameResolver*, const std::vector<ConnectionFactory*>&, TimerFactory*); |
| 30 | ~ChainedConnector(); | ||
| 29 | 31 | ||
| 30 | void setTimeoutMilliseconds(int milliseconds); | 32 | void setTimeoutMilliseconds(int milliseconds); |
| 31 | void start(); | 33 | void start(); |
| 32 | void stop(); | 34 | void stop(); |
| 33 | 35 | ||