Merge pull request #2554 from lukaszwojciechowski/master

pqarmitage · web-flow · commit d178d93756f5 · 2025-02-27T09:12:58.000Z
Fix segfault caused double erase from child_pid rb tree
diff --git a/lib/scheduler.c b/lib/scheduler.c
@@ -2210,7 +2210,6 @@ process_child_termination(pid_t pid, int status)
 		 * and it is still on the thread->ready queue. Since we have now got
 		 * the termination, just handle the termination instead. */
 		thread->type = THREAD_CHILD_TERMINATED;
-		rb_erase(&thread->rb_data, &master->child_pid);
 	}
 	else
 		thread_move_ready(m, &m->child, thread, THREAD_CHILD_TERMINATED);

Original file line number	Diff line number	Diff line change
`@@ -2210,7 +2210,6 @@ process_child_termination(pid_t pid, int status)`
`2210`	`2210`	`* and it is still on the thread->ready queue. Since we have now got`
`2211`	`2211`	`* the termination, just handle the termination instead. */`
`2212`	`2212`	`thread->type = THREAD_CHILD_TERMINATED;`
`2213`		`- rb_erase(&thread->rb_data, &master->child_pid);`
`2214`	`2213`	`}`
`2215`	`2214`	`else`
`2216`	`2215`	`thread_move_ready(m, &m->child, thread, THREAD_CHILD_TERMINATED);`