Upload: Catch out-of-memory error #68802.5

This will avoid a rare-but-regular crash in low-memory situations.

Note that this is a workaround: In 2.6 this code should be adjusted to
not read a full file chunk into memory immediately and instead load more
data on demand.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp
index a8b260515..e21eb7028 100644
--- a/src/libsync/propagateupload.cpp
+++ b/src/libsync/propagateupload.cpp
@@ -341,7 +341,12 @@ bool UploadDevice::prepareAndOpen(const QString &fileName, qint64 start, qint64
     }
 
     size = qBound(0ll, size, FileSystem::getSize(fileName) - start);
-    _data.resize(size);
+    try {
+        _data.resize(size);
+    } catch (const std::bad_alloc &) {
+        setErrorString(tr("Not enough memory to allocate file buffer of size %1").arg(size));
+        return false;
+    }
     auto read = file.read(_data.data(), size);
     if (read != size) {
         setErrorString(file.errorString());