Don't crash on corrupt animated images

1 files changed, 20 insertions, 15 deletions

diff --git a/src/ui/MxcAnimatedImage.cpp b/src/ui/MxcAnimatedImage.cpp
index 2f3af137..4af527b4 100644
--- a/src/ui/MxcAnimatedImage.cpp
+++ b/src/ui/MxcAnimatedImage.cpp
@@ -70,23 +70,28 @@ MxcAnimatedImage::startDownload()
         if (!self)
             return;
 
-        if (buffer.isOpen()) {
-            movie.stop();
-            movie.setDevice(nullptr);
-            buffer.close();
+        try {
+            if (buffer.isOpen()) {
+                movie.stop();
+                movie.setDevice(nullptr);
+                buffer.close();
+            }
+
+            if (encryptionInfo) {
+                QByteArray ba = device.readAll();
+                std::string temp(ba.constData(), ba.size());
+                temp =
+                  mtx::crypto::to_string(mtx::crypto::decrypt_file(temp, encryptionInfo.value()));
+                buffer.setData(temp.data(), temp.size());
+            } else {
+                buffer.setData(device.readAll());
+            }
+            buffer.open(QIODevice::ReadOnly);
+            buffer.reset();
+        } catch (const std::exception &e) {
+            nhlog::net()->error("Failed to setup animated image buffer: {}", e.what());
         }
 
-        if (encryptionInfo) {
-            QByteArray ba = device.readAll();
-            std::string temp(ba.constData(), ba.size());
-            temp = mtx::crypto::to_string(mtx::crypto::decrypt_file(temp, encryptionInfo.value()));
-            buffer.setData(temp.data(), temp.size());
-        } else {
-            buffer.setData(device.readAll());
-        }
-        buffer.open(QIODevice::ReadOnly);
-        buffer.reset();
-
         QTimer::singleShot(0, this, [this, mimeType] {
             nhlog::ui()->info(
               "Playing movie with size: {}, {}", buffer.bytesAvailable(), buffer.isOpen());