Skip to content

Fix a state corruption bug in 4 TaffyTree member functions that causes a crash on TaffyTree::remove. #1102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CyberspaceDreamn wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix a state corruption bug in 4 TaffyTree member functions that causes a crash on TaffyTree::remove. #1102

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df0388b
Fix a crash when calling `TaffyTree::remove` after `TaffyTree::add_ch…
CyberspaceDreamn Aug 13, 2026
b00bea1
Fix cargo clippy warnings
CyberspaceDreamn Aug 14, 2026
03ce840
Propagate errors when `TaffyTree::remove_child` fails in `TaffyTree::…
CyberspaceDreamn Aug 14, 2026
da6bade
Patch a state corruption bug in `TaffyTree::replace_child_at_index` t…
CyberspaceDreamn Aug 14, 2026
bfaa42e
Patch a state corruption bug in `TaffyTree::new_with_children` that c…
CyberspaceDreamn Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions src/tree/taffy_tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,13 @@ impl<NodeContext> TaffyTree<NodeContext> {
let id = NodeId::from(self.nodes.insert(NodeData::new(layout)));

for child in children {
self.parents[(*child).into()] = Some(id);
let child_key = (*child).into();

if let Some(old_parent) = self.parents[child_key] {
self.remove_child(old_parent, *child)?;
}

self.parents[child_key] = Some(id);
}

let _ = self.children.insert(children.iter().copied().collect::<_>());
Expand Down Expand Up @@ -670,6 +676,11 @@ impl<NodeContext> TaffyTree<NodeContext> {
pub fn add_child(&mut self, parent: NodeId, child: NodeId) -> TaffyResult<()> {
let parent_key = parent.into();
let child_key = child.into();

if let Some(old_parent) = self.parents[child_key] {
self.remove_child(old_parent, child)?;
}

self.parents[child_key] = Some(parent);
self.children[parent_key].push(child);
self.mark_dirty(parent)?;
Expand All @@ -680,13 +691,18 @@ impl<NodeContext> TaffyTree<NodeContext> {
/// Inserts a `child` node at the given `child_index` under the supplied `parent`, shifting all children after it to the right.
pub fn insert_child_at_index(&mut self, parent: NodeId, child_index: usize, child: NodeId) -> TaffyResult<()> {
let parent_key = parent.into();
let child_key = child.into();

if let Some(old_parent) = self.parents[child_key] {
self.remove_child(old_parent, child)?;
}

let child_count = self.children[parent_key].len();
if child_index > child_count {
return Err(TaffyError::ChildIndexOutOfBounds { parent, child_index, child_count });
}

self.parents[child.into()] = Some(parent);
self.parents[child_key] = Some(parent);
self.children[parent_key].insert(child_index, child);
self.mark_dirty(parent)?;

Expand Down Expand Up @@ -774,13 +790,18 @@ impl<NodeContext> TaffyTree<NodeContext> {
new_child: NodeId,
) -> TaffyResult<NodeId> {
let parent_key = parent.into();
let new_child_key = new_child.into();

if let Some(old_parent) = self.parents[new_child_key] {
self.remove_child(old_parent, new_child)?;
}

let child_count = self.children[parent_key].len();
if child_index >= child_count {
return Err(TaffyError::ChildIndexOutOfBounds { parent, child_index, child_count });
}

self.parents[new_child.into()] = Some(parent);
self.parents[new_child_key] = Some(parent);
let old_child = core::mem::replace(&mut self.children[parent_key][child_index], new_child);
self.parents[old_child.into()] = None;

Expand Down