Commit Diff

Commit:
96732e0bd8fda8495cad5fb0c432269a57a175f7
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
fix error handling in got_pack_stop_privsep_child()
Actions:
Patch | Tree
commit - e93cd8287a8164af8da813d5d1f764e7b68ed244
commit + 96732e0bd8fda8495cad5fb0c432269a57a175f7
blob - b16b4be257ce68d10cdae28713c204ef2a8862dc
blob + 6c51109b82fc94cdee67d253b305f39d6961fcad
--- lib/pack.c
+++ lib/pack.c
@@ -481,16 +481,15 @@ got_packidx_get_object_idx(struct got_packidx *packidx
 const struct got_error *
 got_pack_stop_privsep_child(struct got_pack *pack)
 {
-	const struct got_error *err = NULL, *child_err = NULL;
+	const struct got_error *err = NULL;
 
 	if (pack->privsep_child == NULL)
 		return NULL;
 
 	err = got_privsep_send_stop(pack->privsep_child->imsg_fd);
-	child_err = got_privsep_wait_for_child(
-	    pack->privsep_child->pid);
-	if (child_err && err == NULL)
-		err = child_err;
+	if (err)
+		return err;
+	err = got_privsep_wait_for_child(pack->privsep_child->pid);
 	free(pack->privsep_child);
 	pack->privsep_child = NULL;
 	return err;