Merge branch 'dg/run-command-child-cleanup' into maint

gitster · gitster · commit cc84144d48dc · 2012-09-20T15:55:12.000-07:00
* dg/run-command-child-cleanup:
  run-command.c: fix broken list iteration in clear_child_for_cleanup
diff --git a/run-command.c b/run-command.c
@@ -53,13 +53,14 @@ static void mark_child_for_cleanup(pid_t pid)
 
 static void clear_child_for_cleanup(pid_t pid)
 {
-	struct child_to_clean **last, *p;
+	struct child_to_clean **pp;
 
-	last = &children_to_clean;
-	for (p = children_to_clean; p; p = p->next) {
-		if (p->pid == pid) {
-			*last = p->next;
-			free(p);
+	for (pp = &children_to_clean; *pp; pp = &(*pp)->next) {
+		struct child_to_clean *clean_me = *pp;
+
+		if (clean_me->pid == pid) {
+			*pp = clean_me->next;
+			free(clean_me);
 			return;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -53,13 +53,14 @@ static void mark_child_for_cleanup(pid_t pid)`
`53`	`53`
`54`	`54`	`static void clear_child_for_cleanup(pid_t pid)`
`55`	`55`	`{`
`56`		`- struct child_to_clean *last, p;`
	`56`	`+ struct child_to_clean **pp;`
`57`	`57`
`58`		`- last = &children_to_clean;`
`59`		`- for (p = children_to_clean; p; p = p->next) {`
`60`		`- if (p->pid == pid) {`
`61`		`- *last = p->next;`
`62`		`- free(p);`
	`58`	`+ for (pp = &children_to_clean; pp; pp = &(pp)->next) {`
	`59`	`+ struct child_to_clean clean_me = pp;`
	`60`	`+`
	`61`	`+ if (clean_me->pid == pid) {`
	`62`	`+ *pp = clean_me->next;`
	`63`	`+ free(clean_me);`
`63`	`64`	`return;`
`64`	`65`	`}`
`65`	`66`	`}`