1 files changed, 14 insertions, 8 deletions
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,3 +1,3 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
@@ -21,9 +21,15 @@ std::shared_ptr<ByteArray> ByteArrayReadBytestream::read(size_t size) {
     }
-    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 {};
+    }
 }