Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-06-19 12:45:31 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-07-08 07:08:08 (GMT) |
| commit | a2b065eb22755f9341c58096805875021faffa67 (patch) | |
| tree | 0283b12cc160260e5b1c04d377dbab6ebef7fe36 /Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp | |
| parent | 07544ee46ffda935714dfc36e5bc5582a7d8c2b0 (diff) | |
| download | swift-a2b065eb22755f9341c58096805875021faffa67.zip swift-a2b065eb22755f9341c58096805875021faffa67.tar.bz2 | |
Stop timer when SOCKS5BytestreamClientSession is deleted
ASAN reported heap-use-after-free because if the timer is running
and an instance is freed, the signal of the timer is still emitted and
connected slots are called.
Test-Information:
Tested that the ASAN report wents away with this fix.
Change-Id: Id785737c4c015e5c638e9d9f6419d740d6cf83b9
Diffstat (limited to 'Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp')
| -rw-r--r-- | Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp index 4a0cd67..04d5d86 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp +++ b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp @@ -13,19 +13,19 @@ #include "SOCKS5BytestreamClientSession.h" #include <boost/bind.hpp> #include <boost/numeric/conversion/cast.hpp> #include <Swiften/Base/Algorithm.h> -#include <Swiften/Base/SafeByteArray.h> +#include <Swiften/Base/ByteArray.h> #include <Swiften/Base/Concat.h> #include <Swiften/Base/Log.h> -#include <Swiften/StringCodecs/Hexify.h> +#include <Swiften/Base/SafeByteArray.h> #include <Swiften/FileTransfer/BytestreamException.h> #include <Swiften/Network/TimerFactory.h> -#include <Swiften/Base/ByteArray.h> +#include <Swiften/StringCodecs/Hexify.h> namespace Swift { SOCKS5BytestreamClientSession::SOCKS5BytestreamClientSession( boost::shared_ptr<Connection> connection, const HostAddressPort& addressPort, @@ -39,12 +39,13 @@ SOCKS5BytestreamClientSession::SOCKS5BytestreamClientSession( weFailedTimeout = timerFactory->createTimer(3000); weFailedTimeout->onTick.connect( boost::bind(&SOCKS5BytestreamClientSession::handleWeFailedTimeout, this)); } SOCKS5BytestreamClientSession::~SOCKS5BytestreamClientSession() { + weFailedTimeout->stop(); } void SOCKS5BytestreamClientSession::start() { assert(state == Initial); SWIFT_LOG(debug) << "Trying to connect via TCP to " << addressPort.toString() << "." << std::endl; weFailedTimeout->start(); |