Commit Diff


commit - 0ace2525a42723ccf617b515903cdac7a19f98f58f90f1b59461216a1088152a
commit + 05c019caa29a5bbe3b58ee98b9ce8e7f7d29a76a13c4a7ea8d649f4c87c4aceb
blob - 0537da2b6f1a20571633c40161fe9a2f705ac2a5ab41f3d003228946dc669429
blob + 7b16dbdd3b4333f5ff4c0478076937bce6c1264e3294d7c4078d10cddec12bba
--- gotsysd/libexec/gotsys-apply-conf/gotsys-apply-conf.c	
+++ gotsysd/libexec/gotsys-apply-conf/gotsys-apply-conf.c	
@@ -451,16 +451,17 @@ done:
 		err = got_error_from_errno("close");
 	if (secrets_fd != -1 && close(secrets_fd) == -1 && err == NULL)
 		err = got_error_from_errno("close"); 
-	if (gotsysd_iev.ibuf.fd != -1)
-		imsgbuf_clear(&gotsysd_iev.ibuf);
 	if (gotd_iev.ibuf.fd != -1)
 		imsgbuf_clear(&gotd_iev.ibuf);
 	if (gotd_sock != -1 && close(gotd_sock) == -1 && err == NULL)
 		err = got_error_from_errno("close");
 	if (err) {
 		fprintf(stderr, "%s: %s\n", getprogname(), err->msg);
-		gotsysd_imsg_send_error(&gotsysd_iev.ibuf, 0, 0, err);
+		if (gotsysd_iev.ibuf.fd != -1)
+			gotsysd_imsg_send_error(&gotsysd_iev.ibuf, 0, 0, err);
 	}
+	if (gotsysd_iev.ibuf.fd != -1)
+		imsgbuf_clear(&gotsysd_iev.ibuf);
 	if (close(GOTSYSD_FILENO_MSG_PIPE) == -1 && err == NULL) {
 		err = got_error_from_errno("close");
 		fprintf(stderr, "%s: %s\n", getprogname(), err->msg);