system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 10:36:24 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Mail: Fix crash caused by migration from NonnullRefPtrVector

Browse source 
When we moved from NonnullRefPtrVector<T> to Vector<NonnullRefPtr<T>>
in commit 8a48246ed1, the `at()` function
started returning a NonnullRefPtr<T>& instead of T&.

The code calling create_index() was not then updated and ended up taking
a pointer to a temporary NonnullRefPtr<>, instead of an actual object,
leading to a crash after logging in.
This commit is contained in:
Karol Kosek 2023-07-05 01:34:33 +02:00 committed by Andreas Kling
parent dfcd5ffaba
commit bd853de716
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Userland/Applications/Mail/MailboxTreeModel.cpp
View file

@ -21,17 +21,17 @@ GUI::ModelIndex MailboxTreeModel::index(int row, int column, GUI::ModelIndex con
if (!parent.is_valid()) {
if (m_account_holder.accounts().is_empty())
return {};
return create_index(row, column, &m_account_holder.accounts().at(row));
return create_index(row, column, m_account_holder.accounts().at(row));
}
auto& base_node = *static_cast<BaseNode*>(parent.internal_data());
if (is<MailboxNode>(base_node)) {
auto& remote_mailbox = verify_cast<MailboxNode>(base_node);
return create_index(row, column, &remote_mailbox.children().at(row));
return create_index(row, column, remote_mailbox.children().at(row));
}
auto& remote_parent = verify_cast<AccountNode>(base_node);
return create_index(row, column, &remote_parent.mailboxes().at(row));
return create_index(row, column, remote_parent.mailboxes().at(row));
}
GUI::ModelIndex MailboxTreeModel::parent_index(GUI::ModelIndex const& index) const