From dda813899fdb4a520dc83e10c17c1923712a8f7d Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Thu, 19 Nov 2020 14:56:09 +0100
Subject: Fix Q_ASSERT failure on sending messages

Changes in e81117fb exposed a flaw in EncryptionEvent causing assertion
failure when this event is default-initialised (i.e. no encryption).
---
 lib/room.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib/room.cpp')

diff --git a/lib/room.cpp b/lib/room.cpp
index 7ac3463e..1af294a7 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -2580,8 +2580,14 @@ Room::Changes Room::processStateEvent(const RoomEvent& e)
             // clang-format off
         }
         , [this, oldEncEvt = static_cast<const EncryptionEvent*>(oldStateEvent)](
-            const EncryptionEvent&) {
+            const EncryptionEvent& ee) {
             // clang-format on
+            if (ee.algorithm().isEmpty()) {
+                qWarning(STATE)
+                    << "The encryption event for room" << objectName()
+                    << "doesn't have 'algorithm' specified - ignoring";
+                return NoChange;
+            }
             if (oldEncEvt
                 && oldEncEvt->encryption() != EncryptionEventContent::Undefined) {
                 qCWarning(STATE) << "The room is already encrypted but a new"
-- 
cgit v1.2.3