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

Fix two null pointer dereferences

Browse Source
This commit is contained in:
Kevin Wolf
2023-02-20 19:00:54 +00:00
committed by Tobias Fella
parent 2dd3197beb
commit 084b89f3dc
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/models/messageeventmodel.cpp
View File

@@ -975,6 +975,9 @@ QVariant MessageEventModel::getLatestMessageFromIndex(const int baseline)
for (auto it = timelineBottom; it != limit; ++it) { for (auto it = timelineBottom; it != limit; ++it) {
auto evt = it->event(); auto evt = it->event();
auto e = eventCast<const RoomMessageEvent>(evt); auto e = eventCast<const RoomMessageEvent>(evt);
if (!e) {
continue;
}
auto content = (*it)->contentJson(); auto content = (*it)->contentJson();

5
src/models/roomlistmodel.cpp
View File

@@ -229,10 +229,13 @@ void RoomListModel::handleNotifications()
continue; continue;
} }
oldNotifications += notification["event"].toObject()["event_id"].toString(); oldNotifications += notification["event"].toObject()["event_id"].toString();
auto room = m_connection->room(notification["room_id"].toString()); auto room = m_connection->room(notification["room_id"].toString());
auto currentRoom = RoomManager::instance().currentRoom();
bool roomIsActive = currentRoom && room->id() == currentRoom->id();
// If room exists, room is NOT active OR the application is NOT active, show notification // If room exists, room is NOT active OR the application is NOT active, show notification
if (room && !(room->id() == RoomManager::instance().currentRoom()->id() && QGuiApplication::applicationState() == Qt::ApplicationActive)) { if (room && !(roomIsActive && QGuiApplication::applicationState() == Qt::ApplicationActive)) {
// The room might have been deleted (for example rejected invitation). // The room might have been deleted (for example rejected invitation).
auto sender = room->user(notification["event"].toObject()["sender"].toString()); auto sender = room->user(notification["event"].toObject()["sender"].toString());