mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-04 13:59:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix use-after free in ase_ungroup_all()

Browse Source 
Anyway this code is not used anymore, it was for v1.1 when v1.1 and
v1.2 branches were developed at the same time (layer groups feature
was added in v1.2, so v1.1 just moved groups children to the root).
This commit is contained in:
David Capello 2024-02-27 13:20:13 -03:00
parent 52afc9e9a7
commit 7aca017a58
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/file/ase_format.cpp
View File

@ -1696,8 +1696,12 @@ static void ase_ungroup_all(LayerGroup* group)
for (Layer* child : list) { for (Layer* child : list) {
if (child->isGroup()) { if (child->isGroup()) {
ase_ungroup_all(static_cast<LayerGroup*>(child)); auto* childGroup = static_cast<LayerGroup*>(child);
group->removeLayer(child); ase_ungroup_all(childGroup);
group->removeLayer(childGroup);
ASSERT(childGroup->layersCount() == 0);
delete childGroup;
} }
else if (group != root) { else if (group != root) {
// Create a new name adding all group layer names // Create a new name adding all group layer names
@ -1715,11 +1719,6 @@ static void ase_ungroup_all(LayerGroup* group)
root->addLayer(child); root->addLayer(child);
} }
} }
if (group != root) {
ASSERT(group->layersCount() == 0);
delete group;
}
} }
} // namespace app } // namespace app