RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-15 04:24:59 +00:00
Code Issues Activity Actions

FileManager+LibGUI: Fix two folder-related crashes (#569)

Browse source 
Fix a crash when opening a folder, and another one when trying to open
a newly created folder.

It was not safe to modify a GModelSelection while it's being iterated over.

Fixes #536.
This commit is contained in:
Brandon Scott 2019-09-17 02:26:10 -05:00 • committed by Andreas Kling
parent caf1b37e75
commit a4d52b122d
4 changed files with 46 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Libraries/LibGUI/GFileSystemModel.cpp
View file

@ -31,6 +31,15 @@ struct GFileSystemModel::Node {
ASSERT_NOT_REACHED();
}
void cleanup()
{
for (auto& child: children) {
child->cleanup();
delete child;
}
children.clear();
}
void traverse_if_needed(const GFileSystemModel& model)
{
if (type != Node::Directory || has_traversed)
@ -146,15 +155,22 @@ GFileSystemModel::~GFileSystemModel()
void GFileSystemModel::update()
{
// FIXME: Support refreshing the model!
if (m_root)
return;
cleanup();
m_root = new Node;
m_root->name = m_root_path;
m_root->reify_if_needed(*this);
}
void GFileSystemModel::cleanup()
{
if (m_root) {
m_root->cleanup();
delete m_root;
m_root = nullptr;
}
}
int GFileSystemModel::row_count(const GModelIndex& index) const
{
if (!index.is_valid())