Trensa-Organization/hy3
1
0
Fork 0
mirror of https://github.com/Trensa-Organization/hy3.git synced 2025-03-15 18:53:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix UAF in root node

Browse source 
The root node's last focused child could be freed without the root
node being updated. This broke the selection hook which uses `root->getFocusedNode()`.
This commit is contained in:
outfoxxed 2023-05-01 19:54:37 -07:00
parent 62235536c3
commit 87e82cc574
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Hy3Layout.cpp
View file

@ -295,12 +295,23 @@ Hy3Node* Hy3Node::removeFromParentRecursive() {
Debug::log(LOG, "Recursively removing parent nodes of %p", parent);
while (parent->parent != nullptr) {
while (parent != nullptr) {
if (parent->parent == nullptr) {
Debug::log(ERR, "* UAF DEBUGGING - %p's parent is null, its the root group", parent);
if (parent == this) {
Debug::log(ERR, "* UAF DEBUGGING - returning nullptr as this == root group");
} else {
Debug::log(ERR, "* UAF DEBUGGING - deallocing %p and returning nullptr", parent);
parent->layout->nodes.remove(*parent);
}
return nullptr;
}
auto* child = parent;
parent = parent->parent;
auto& group = parent->data.as_group;
if (group.children.size() > 2) {
auto iter = std::find(group.children.begin(), group.children.end(), child);
@ -323,10 +334,12 @@ Hy3Node* Hy3Node::removeFromParentRecursive() {
if (child != this) {
parent->layout->nodes.remove(*child);
} else {
child->parent = nullptr;
}
if (!group.children.empty()) {
auto splitmod = group.children.empty() ? 0.0 : -((1.0 - child->size_ratio) / group.children.size());
auto splitmod = -((1.0 - child->size_ratio) / group.children.size());
for (auto* child: group.children) {
child->size_ratio += splitmod;
@ -1248,7 +1261,7 @@ Hy3Node* Hy3Layout::shiftOrGetFocus(Hy3Node& node, ShiftDirection direction, boo
node.parent = target_group;
node.size_ratio = 1.0;
old_parent->recalcSizePosRecursive();
if (old_parent != nullptr) old_parent->recalcSizePosRecursive();
target_group->recalcSizePosRecursive();
auto* target_parent = target_group->parent;