7 files changed, 39 insertions, 27 deletions
diff --git a/Swiften/Elements/IBB.h b/Swiften/Elements/IBB.h
index bd0b661..6ebe66e 100644
--- a/Swiften/Elements/IBB.h
+++ b/Swiften/Elements/IBB.h
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 #include <vector>
@@ -22,22 +22,22 @@ namespace Swift {
                 Open,
                 Close,
                 Data
             };
             enum StanzaType {
                 IQStanza,
                 MessageStanza
             };
 
-            IBB(Action action = Open, const std::string& streamID = "") : action(action), streamID(streamID), stanzaType(IQStanza), blockSize(-1), sequenceNumber(-1) {
+            IBB(Action action = Open, const std::string& streamID = "") : action(action), streamID(streamID), stanzaType(IQStanza), blockSize(0), sequenceNumber(-1) {
             }
 
-            static IBB::ref createIBBOpen(const std::string& streamID, int blockSize) {
+            static IBB::ref createIBBOpen(const std::string& streamID, unsigned int blockSize) {
                 IBB::ref result = std::make_shared<IBB>(Open, streamID);
                 result->setBlockSize(blockSize);
                 return result;
             }
 
             static IBB::ref createIBBData(const std::string& streamID, int sequenceNumber, const std::vector<unsigned char>& data) {
                 IBB::ref result = std::make_shared<IBB>(Data, streamID);
                 result->setSequenceNumber(sequenceNumber);
                 result->setData(data);
@@ -74,34 +74,34 @@ namespace Swift {
 
             const std::vector<unsigned char>& getData() const {
                 return data;
             }
 
             void setData(const std::vector<unsigned char>& data) {
                 this->data = data;
             }
 
-            int getBlockSize() const {
+            unsigned int getBlockSize() const {
                 return blockSize;
             }
 
-            void setBlockSize(int blockSize) {
+            void setBlockSize(unsigned int blockSize) {
                 this->blockSize = blockSize;
             }
 
             int getSequenceNumber() const {
                 return sequenceNumber;
             }
 
             void setSequenceNumber(int i) {
                 sequenceNumber = i;
             }
 
         private:
             Action action;
             std::string streamID;
             std::vector<unsigned char> data;
             StanzaType stanzaType;
-            int blockSize;
+            unsigned int blockSize;
             int sequenceNumber;
     };
 }
diff --git a/Swiften/FileTransfer/ByteArrayReadBytestream.cpp b/Swiften/FileTransfer/ByteArrayReadBytestream.cpp
index cd9fa4a..3fdff27 100644
--- a/Swiften/FileTransfer/ByteArrayReadBytestream.cpp
+++ b/Swiften/FileTransfer/ByteArrayReadBytestream.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/FileTransfer/ByteArrayReadBytestream.h>
 
 #include <memory>
 
 #include <boost/numeric/conversion/cast.hpp>
@@ -13,22 +13,28 @@
 #include <Swiften/Base/Algorithm.h>
 
 using namespace Swift;
 
 std::shared_ptr<ByteArray> ByteArrayReadBytestream::read(size_t size) {
     size_t readSize = size;
     if (position + readSize > data.size()) {
         readSize = data.size() - position;
     }
-    std::shared_ptr<ByteArray> result = std::make_shared<ByteArray>(
-            data.begin() + boost::numeric_cast<long long>(position),
-            data.begin() + boost::numeric_cast<long long>(position) + boost::numeric_cast<long long>(readSize));
-
-    onRead(*result);
-    position += readSize;
-    return result;
+    try {
+        std::shared_ptr<ByteArray> result = std::make_shared<ByteArray>(
+                data.begin() + boost::numeric_cast<long long>(position),
+                data.begin() + boost::numeric_cast<long long>(position) + boost::numeric_cast<long long>(readSize));
+        onRead(*result);
+        position += readSize;
+        return result;
+    }
+    catch (const boost::numeric::bad_numeric_cast&) {
+        // If we cannot cast to long long, we probably ran out of memory long ago
+        assert(false);
+        return {};
+    }
 }
 
 void ByteArrayReadBytestream::addData(const std::vector<unsigned char>& moreData) {
     append(data, moreData);
     onDataAvailable();
 }
diff --git a/Swiften/FileTransfer/IBBSendSession.cpp b/Swiften/FileTransfer/IBBSendSession.cpp
index e51c91c..258412b 100644
--- a/Swiften/FileTransfer/IBBSendSession.cpp
+++ b/Swiften/FileTransfer/IBBSendSession.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/FileTransfer/IBBSendSession.h>
 
 #include <boost/bind.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
@@ -34,19 +34,19 @@ IBBSendSession::IBBSendSession(
     bytestream->onDataAvailable.connect(boost::bind(&IBBSendSession::handleDataAvailable, this));
 }
 
 IBBSendSession::~IBBSendSession() {
     bytestream->onDataAvailable.disconnect(boost::bind(&IBBSendSession::handleDataAvailable, this));
 }
 
 void IBBSendSession::start() {
     IBBRequest::ref request = IBBRequest::create(
-            from, to, IBB::createIBBOpen(id, boost::numeric_cast<int>(blockSize)), router);
+            from, to, IBB::createIBBOpen(id, blockSize), router);
     request->onResponse.connect(boost::bind(&IBBSendSession::handleIBBResponse, this, _1, _2));
     active = true;
     request->send();
     currentRequest = request;
 }
 
 void IBBSendSession::stop() {
     if (active && router->isAvailable()) {
         IBBRequest::create(from, to, IBB::createIBBClose(id), router)->send();
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerSession.cpp b/Swiften/FileTransfer/SOCKS5BytestreamServerSession.cpp
index bc4e8e4..0fd40bf 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamServerSession.cpp
+++ b/Swiften/FileTransfer/SOCKS5BytestreamServerSession.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/FileTransfer/SOCKS5BytestreamServerSession.h>
 
 #include <boost/bind.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
@@ -132,19 +132,26 @@ void SOCKS5BytestreamServerSession::process() {
                 if (i != unprocessedData.size()) {
                     SWIFT_LOG(debug) << "Junk after authentication mechanism" << std::endl;
                 }
                 unprocessedData.clear();
                 streamID = byteArrayToString(requestID);
                 bool hasBytestream = bytestreams->hasBytestream(streamID);
                 SafeByteArray result = createSafeByteArray("\x05", 1);
                 result.push_back(hasBytestream ? 0x0 : 0x4);
                 append(result, createByteArray("\x00\x03", 2));
-                result.push_back(boost::numeric_cast<unsigned char>(requestID.size()));
+                try {
+                    result.push_back(boost::numeric_cast<unsigned char>(requestID.size()));
+                }
+                catch (const boost::numeric::bad_numeric_cast& e) {
+                    SWIFT_LOG(warning) << "SOCKS5 request ID is too long (" << requestID.size() << "): " << e.what() << std::endl;
+                    finish();
+                    return;
+                }
                 append(result, concat(requestID, createByteArray("\x00\x00", 2)));
                 if (!hasBytestream) {
                     SWIFT_LOG(debug) << "Readstream or Wrtiestream with ID " << streamID << " not found!" << std::endl;
                     connection->write(result);
                     finish(boost::optional<FileTransferError>(FileTransferError::PeerError));
                 }
                 else {
                     SWIFT_LOG(debug) << "Found stream. Sent OK." << std::endl;
                     connection->write(result);
diff --git a/Swiften/FileTransfer/UnitTest/IBBSendSessionTest.cpp b/Swiften/FileTransfer/UnitTest/IBBSendSessionTest.cpp
index f9057f8..2399cbe 100644
--- a/Swiften/FileTransfer/UnitTest/IBBSendSessionTest.cpp
+++ b/Swiften/FileTransfer/UnitTest/IBBSendSessionTest.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <vector>
 
 #include <boost/bind.hpp>
 
 #include <cppunit/extensions/HelperMacros.h>
@@ -52,19 +52,19 @@ class IBBSendSessionTest : public CppUnit::TestFixture {
             std::shared_ptr<IBBSendSession> testling = createSession("foo@bar.com/baz");
             testling->setBlockSize(1234);
 
             testling->start();
 
             CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(stanzaChannel->sentStanzas.size()));
             CPPUNIT_ASSERT(stanzaChannel->isRequestAtIndex<IBB>(0, JID("foo@bar.com/baz"), IQ::Set));
             IBB::ref ibb = stanzaChannel->sentStanzas[0]->getPayload<IBB>();
             CPPUNIT_ASSERT_EQUAL(IBB::Open, ibb->getAction());
-            CPPUNIT_ASSERT_EQUAL(1234, ibb->getBlockSize());
+            CPPUNIT_ASSERT_EQUAL(1234u, ibb->getBlockSize());
             CPPUNIT_ASSERT_EQUAL(std::string("myid"), ibb->getStreamID());
         }
 
         void testStart_ResponseStartsSending() {
             std::shared_ptr<IBBSendSession> testling = createSession("foo@bar.com/baz");
             testling->setBlockSize(3);
             testling->start();
 
             stanzaChannel->onIQReceived(createIBBResult());
diff --git a/Swiften/Parser/PayloadParsers/IBBParser.cpp b/Swiften/Parser/PayloadParsers/IBBParser.cpp
index 9b6babc..1ba44e1 100644
--- a/Swiften/Parser/PayloadParsers/IBBParser.cpp
+++ b/Swiften/Parser/PayloadParsers/IBBParser.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Parser/PayloadParsers/IBBParser.h>
 
 #include <boost/lexical_cast.hpp>
 
 #include <Swiften/StringCodecs/Base64.h>
@@ -33,19 +33,19 @@ void IBBParser::handleStartElement(const std::string& element, const std::string
             getPayloadInternal()->setAction(IBB::Open);
             getPayloadInternal()->setStreamID(attributes.getAttribute("sid"));
             if (attributes.getAttribute("stanza") == "message") {
                 getPayloadInternal()->setStanzaType(IBB::MessageStanza);
             }
             else {
                 getPayloadInternal()->setStanzaType(IBB::IQStanza);
             }
             try {
-                getPayloadInternal()->setBlockSize(boost::lexical_cast<int>(attributes.getAttribute("block-size")));
+                getPayloadInternal()->setBlockSize(boost::lexical_cast<unsigned int>(attributes.getAttribute("block-size")));
             }
             catch (boost::bad_lexical_cast&) {
             }
         }
         else if (element == "close") {
             getPayloadInternal()->setAction(IBB::Close);
             getPayloadInternal()->setStreamID(attributes.getAttribute("sid"));
         }
     }
diff --git a/Swiften/QA/FileTransferTest/FileTransferTest.cpp b/Swiften/QA/FileTransferTest/FileTransferTest.cpp
index ebdb36a..7d69277 100644
--- a/Swiften/QA/FileTransferTest/FileTransferTest.cpp
+++ b/Swiften/QA/FileTransferTest/FileTransferTest.cpp
@@ -1,20 +1,19 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <fstream>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
-#include <boost/numeric/conversion/cast.hpp>
 
 
 #include <Swiften/Base/Debug.h>
 #include <Swiften/Base/Log.h>
 #include <Swiften/Base/sleep.h>
 #include <Swiften/Base/StdRandomGenerator.h>
 #include <Swiften/Client/Client.h>
 #include <Swiften/Client/ClientXMLTracer.h>
 #include <Swiften/Disco/ClientDiscoManager.h>
@@ -72,26 +71,26 @@ class FileTransferTest {
             receiver_->connect(options);
 
             timeOut_ = networkFactories->getTimerFactory()->createTimer(60000);
             timeOut_->onTick.connect(boost::bind(&FileTransferTest::handleTimeOut, this));
 
             // Create randomly sized data to exchange.
             sendFilePath_ = boost::filesystem::unique_path("ft_send_%%%%%%%%%%%%%%%%.bin");
             receiveFilePath_ = boost::filesystem::unique_path("ft_receive_%%%%%%%%%%%%%%%%.bin");
 
-            size_t size = 1024 + boost::numeric_cast<size_t>(randGen.generateRandomInteger(1024 * 10));
+            size_t size = 1024 + static_cast<size_t>(randGen.generateRandomInteger(1024 * 10));
             sendData_.resize(size);
             for (unsigned char& n : sendData_) {
-                n = boost::numeric_cast<unsigned char>(randGen.generateRandomInteger(255));
+                n = static_cast<unsigned char>(randGen.generateRandomInteger(255));
             }
 
             std::ofstream outfile(sendFilePath_.native().c_str(), std::ios::out | std::ios::binary);
-            outfile.write(reinterpret_cast<char *>(&sendData_[0]), boost::numeric_cast<ptrdiff_t>(sendData_.size()));
+            outfile.write(reinterpret_cast<char *>(&sendData_[0]), static_cast<ptrdiff_t>(sendData_.size()));
             outfile.close();
         }
 
         ~FileTransferTest() {
             timeOut_->stop();
 
             delete senderTracer_;
             delete receiverTracer_;