ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Null check pinned messages after decryption when filling PinnedMessageModel.

Browse Source 
`room()->decryptMessage()` returns null if the message fails to decode. Since elements of `m_pinnedEvents`
get directly dereferenced in getEventForIndex, storing null values leads to a segfault.
In this case we should retain the EncryptedEvent to let the UI report the error.
This commit is contained in:
Veres Károly
2026-01-10 01:49:29 +01:00
committed by Tobias Fella
parent 3a416990ca
commit b684fb451d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/timeline/models/pinnedmessagemodel.cpp
View File

@@ -57,7 +57,10 @@ void PinnedMessageModel::fill()
beginInsertRows({}, m_pinnedEvents.size(), m_pinnedEvents.size()); beginInsertRows({}, m_pinnedEvents.size(), m_pinnedEvents.size());
auto ev = fromJson<event_ptr_tt<RoomEvent>>(job->jsonData()); auto ev = fromJson<event_ptr_tt<RoomEvent>>(job->jsonData());
if (auto encEv = eventCast<EncryptedEvent>(ev.get())) { if (auto encEv = eventCast<EncryptedEvent>(ev.get())) {
ev = room()->decryptMessage(*encEv); auto decryptedEvent = room()->decryptMessage(*encEv);
if (decryptedEvent) {
ev = std::move(decryptedEvent);
}
} }
m_pinnedEvents.push_back(std::move(ev)); m_pinnedEvents.push_back(std::move(ev));
Q_EMIT newEventAdded(m_pinnedEvents.back().get()); Q_EMIT newEventAdded(m_pinnedEvents.back().get());