Skip to content

Avoid using destNode after deleting #9367

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
kevinbackhouse wants to merge 1 commit into
base: 0.28.x
Choose a base branch
from
Open

Avoid using destNode after deleting #9367

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions xmpsdk/src/XMPUtils-FileInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,7 @@ AppendSubtree ( const XMP_Node * sourceNode, XMP_Node * destParent, const bool r
if ( destNode != 0 ) {
delete ( destNode );
destParent->children.erase ( destPos );
return;
}

} else if ( destNode == 0 ) {
Expand Down Expand Up @@ -695,6 +696,7 @@ AppendSubtree ( const XMP_Node * sourceNode, XMP_Node * destParent, const bool r
if ( deleteEmpty && destNode->children.empty() ) {
delete ( destNode );
destParent->children.erase ( destPos );
return;
}
}

Expand All @@ -719,6 +721,7 @@ AppendSubtree ( const XMP_Node * sourceNode, XMP_Node * destParent, const bool r
if ( destNode->children.empty() ) {
delete ( destNode );
destParent->children.erase ( destPos );
return;
}
Comment on lines 721 to 725
}

Expand Down
Loading