mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-12 16:06:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5551 from APriestman/5936_emailRecursion

Browse Source 
5936 Prevent infinite recursion in isChild() test
This commit is contained in:
Richard Cordovano 2020-01-09 10:46:33 -05:00 committed by GitHub
commit 752fc0c442
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/EmailMessageThreader.java
View File

@ -687,12 +687,34 @@ final class EmailMessageThreader {
* container, false otherwise.
*/
boolean isChild(EmailContainer container) {
return isChild(container, new HashSet<>());
}
/**
* Search all of this containers children to make sure that the given
* container is not a related.
*
* @param container - the container object to search for
* @param processedContainers - every container seen while doing this isChild check (to prevent possible loop)
*
* @return True if the given container is in the child tree of this
* container, false otherwise.
*/
private boolean isChild(EmailContainer container, Set<EmailContainer> processedContainers) {
processedContainers.add(this);
if (children == null || children.isEmpty()) {
return false;
} else if (children.contains(container)) {
return true;
} else {
return children.stream().anyMatch((child) -> (child.isChild(container)));
for (EmailContainer child : children) {
// Prevent an infinite recursion by making sure we haven't already
// run isChild() on this child
if ((!processedContainers.contains(child)) && child.isChild(container, processedContainers)) {
return true;
}
}
return false;
}
}
}