Merge pull request #1344 from BishopFox/fix/pstree

Fix pstree
BishopFox · Jul 11, 2023 · f2a3915 · f2a3915
2 parents c17c378 + 853a7ab
commit f2a3915
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/client/command/processes/pstree.go b/client/command/processes/pstree.go
@@ -50,9 +50,16 @@ func (n *node) insert(proc *commonpb.Process) {
 }
 
 func (n *node) findParent(proc *commonpb.Process) *node {
+	// Empty node
 	if n.Value == nil {
 		return nil
 	}
+	// Skip self when called from reorder
+	// otherwise things might explode, see #1340
+	if n.Value.Pid == proc.Pid {
+		return nil
+	}
+	// Found parent
 	if n.Value.Pid == proc.Ppid {
 		return n
 	}