commit 7997eed799e2f943652dceae08ca9298e3a5a14b8629bd99608fb26e077eb67f from: Stefan Sperling date: Sat Dec 28 14:32:19 2024 UTC do not leak privsep_child memory allocations if sending a stop command fails commit - 3d1595598c1a0b7093af90589698bb8108148df2d5999d30ba0b5f596fd06a45 commit + 7997eed799e2f943652dceae08ca9298e3a5a14b8629bd99608fb26e077eb67f blob - 606e4422aed4dc216177f8773dad5e35a0435fa6607fa18e4ff651aeeba7cb93 blob + 7869a19c56edbc2cdaa77c897f7194bf7b0287a5caaea5a8d186148afe3b2777 --- lib/pack.c +++ lib/pack.c @@ -814,19 +814,20 @@ done: static const struct got_error * pack_stop_privsep_child(struct got_pack *pack) { - const struct got_error *err = NULL, *close_err = NULL; + const struct got_error *err = NULL; + const struct got_error *close_err = NULL, *child_err = NULL; if (pack->privsep_child == NULL) return NULL; err = got_privsep_send_stop(pack->privsep_child->imsg_fd); - if (err) - return err; if (close(pack->privsep_child->imsg_fd) == -1) close_err = got_error_from_errno("close"); - err = got_privsep_wait_for_child(pack->privsep_child->pid); if (close_err && err == NULL) err = close_err; + child_err = got_privsep_wait_for_child(pack->privsep_child->pid); + if (child_err && err == NULL) + err = child_err; imsgbuf_clear(pack->privsep_child->ibuf); free(pack->privsep_child->ibuf); free(pack->privsep_child);