Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanos Doukoudakis <thanos.doukoudakis@isode.com>2017-05-04 17:55:18 (GMT)
committerKevin Smith <kevin.smith@isode.com>2017-05-05 16:36:29 (GMT)
commit3932697b0d4c9ca01e6d1d2ae84e7f386389e099 (patch)
tree3f207f135ef2f99fcc0de0ca2b9c6a6964f9746f
parentf033fc54d5cd549822a3462bf0dfcc852e7b4dee (diff)
downloadswift-3932697b0d4c9ca01e6d1d2ae84e7f386389e099.zip
swift-3932697b0d4c9ca01e6d1d2ae84e7f386389e099.tar.bz2
Fix SendFile example heap-use-after-free
This fixes the crash by moving Swift::Client to a unique_ptr. By specifying the order the objects will be destructed, we avoid accessing the Socks5ByteStreamProxiesManager instance after it has been destroyed. Also there is no need reset the outgoingFileTransfer pointer. Test Information: Use the SendFile example to send a file to a user connected with Swift. Change-Id: I0462dc60c1d4d5eb3b07516c6e609bbe70954039
Diffstat
-rw-r--r--Swiften/Examples/SendFile/SendFile.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/Swiften/Examples/SendFile/SendFile.cpp b/Swiften/Examples/SendFile/SendFile.cpp
index 0e1fb23..2b701c7 100644
--- a/Swiften/Examples/SendFile/SendFile.cpp
+++ b/Swiften/Examples/SendFile/SendFile.cpp
@@ -12,136 +12,133 @@
#include <Swiften/Base/ByteArray.h>
#include <Swiften/Base/Log.h>
#include <Swiften/Client/Client.h>
#include <Swiften/Client/ClientXMLTracer.h>
#include <Swiften/Disco/EntityCapsManager.h>
#include <Swiften/Elements/Presence.h>
#include <Swiften/EventLoop/EventLoop.h>
#include <Swiften/EventLoop/SimpleEventLoop.h>
#include <Swiften/FileTransfer/FileReadBytestream.h>
#include <Swiften/FileTransfer/FileTransferManager.h>
#include <Swiften/FileTransfer/OutgoingFileTransfer.h>
#include <Swiften/FileTransfer/OutgoingFileTransferManager.h>
#include <Swiften/FileTransfer/SOCKS5BytestreamServer.h>
#include <Swiften/Jingle/JingleSessionManager.h>
#include <Swiften/Network/BoostConnectionServer.h>
#include <Swiften/Network/BoostNetworkFactories.h>
#include <Swiften/Network/BoostTimer.h>
#include <Swiften/Network/TimerFactory.h>
#include <Swiften/StringCodecs/Hexify.h>
using namespace Swift;
static SimpleEventLoop eventLoop;
static BoostNetworkFactories networkFactories(&eventLoop);
static int exitCode = 2;
class FileSender {
public:
- FileSender(const JID& jid, const std::string& password, const JID& recipient, const boost::filesystem::path& file) : jid(jid), password(password), recipient(recipient), file(file), tracer(nullptr) {
- client = new Swift::Client(jid, password, &networkFactories);
+ FileSender(const JID& jid, const std::string& password, const JID& recipient, const boost::filesystem::path& file) : jid(jid), password(password), recipient(recipient), file(file), tracer(nullptr), client(std::unique_ptr<Swift::Client>(new Swift::Client(jid, password, &networkFactories))) {
client->onConnected.connect(boost::bind(&FileSender::handleConnected, this));
client->onDisconnected.connect(boost::bind(&FileSender::handleDisconnected, this, _1));
//tracer = new ClientXMLTracer(client);
client->getEntityCapsProvider()->onCapsChanged.connect(boost::bind(&FileSender::handleCapsChanged, this, _1));
}
~FileSender() {
delete tracer;
client->onDisconnected.disconnect(boost::bind(&FileSender::handleDisconnected, this, _1));
client->onConnected.disconnect(boost::bind(&FileSender::handleConnected, this));
- delete client;
}
void start() {
client->connect();
}
private:
void handleConnected() {
std::cout << "Connected. Awaiting presence from receipient." << std::endl;
client->sendPresence(Presence::create());
}
void handleCapsChanged(JID jid) {
if (jid.toBare() == recipient) {
// create ReadBytestream from file
std::shared_ptr<FileReadBytestream> fileStream = std::make_shared<FileReadBytestream>(file);
outgoingFileTransfer = client->getFileTransferManager()->createOutgoingFileTransfer(recipient, file, "Some File!", fileStream);
if (outgoingFileTransfer) {
outgoingFileTransfer->onFinished.connect(boost::bind(&FileSender::handleFileTransferFinished, this, _1));
std::cout << "Starting file-transfer to " << recipient.toString() << "." << std::endl;
outgoingFileTransfer->start();
// TODO: getting notified about FT status and end
} else {
std::cout << recipient << " doesn't support any kind of file transfer!" << std::endl;
client->disconnect();
}
}
}
void handleDisconnected(const boost::optional<ClientError>& err) {
if (err) {
std::cout << "Disconnected due to error ( " << err.get().getType() << " )." << std::endl;
exit(-1);
}
else {
std::cout << "Successfully disconnected." << std::endl;
}
}
void handleFileTransferFinished(const boost::optional<FileTransferError>& error) {
std::cout << "File transfer finished." << std::endl;
- outgoingFileTransfer.reset();
if (error) {
client->disconnect();
exit(-1);
}
else {
client->disconnect();
exit(0);
}
}
void exit(int code) {
exitCode = code;
eventLoop.stop();
}
private:
BoostConnectionServer::ref connectionServer;
OutgoingFileTransfer::ref outgoingFileTransfer;
JID jid;
std::string password;
JID recipient;
boost::filesystem::path file;
- Client* client;
ClientXMLTracer* tracer;
+ std::unique_ptr<Swift::Client> client;
};
int main(int argc, char* argv[]) {
if (argc != 5) {
std::cerr << "Usage: " << argv[0] << " <jid> <password> <recipient> <file>" << std::endl;
return -1;
}
//Log::setLogLevel(Log::debug);
JID sender(argv[1]);
JID recipient(argv[3]);
FileSender fileSender(sender, std::string(argv[2]), recipient, boost::filesystem::path(argv[4]));
fileSender.start();
{
Timer::ref timer = networkFactories.getTimerFactory()->createTimer(30000);
timer->onTick.connect(boost::bind(&SimpleEventLoop::stop, &eventLoop));
timer->start();
eventLoop.run();
}
return exitCode;
}