From 60bd11426e941f9d349962b8b2ea4bddd9488965 Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Tue, 17 Aug 2021 18:10:58 +0200
Subject: Don't crash when ToDeviceEvent decryption fails

---
 lib/connection.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/connection.cpp b/lib/connection.cpp
index 4a220e0d..60ffed09 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -798,8 +798,13 @@ void Connection::Private::consumeToDeviceEvents(Events&& toDeviceEvents)
             qCDebug(E2EE) << "Unsupported algorithm" << event.id() << "for event" << event.algorithm();
             return;
         }
+        const auto decryptedEvent = sessionDecryptMessage(event);
+        if(!decryptedEvent) {
+            qCWarning(E2EE) << "Failed to decrypt event" << event.id();
+            return;
+        }
 
-        visit(*sessionDecryptMessage(event),
+        visit(*decryptedEvent,
             [this, senderKey = event.senderKey()](const RoomKeyEvent& roomKeyEvent) {
                 if (auto* detectedRoom = q->room(roomKeyEvent.roomId())) {
                     detectedRoom->handleRoomKeyEvent(roomKeyEvent, senderKey);
-- 
cgit v1.2.3