Commit Diff

Commit:
c237d8914d9e7b85e50ad13b46083cdc61a78977
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
render_notification: don't leak fd on error
Actions:
Patch | Tree
commit - cef7eb79352370c77aee8fa482ededde42d8244e
commit + c237d8914d9e7b85e50ad13b46083cdc61a78977
blob - 59b77190c0858bfc132c9daf27aa9806a553132e
blob + fc27cb994aba584eae60004e96e635c5e0f04af6
--- gotd/repo_write.c
+++ gotd/repo_write.c
@@ -2133,26 +2133,32 @@ render_notification(struct imsg *imsg, struct gotd_ims
 	const struct got_error *err = NULL;
 	struct gotd_imsg_notification_content ireq;
 	size_t datalen, len;
-	char *refname;
+	char *refname = NULL;
 	struct ibuf *wbuf;
-	int fd;
+	int fd = -1;
 
 	fd = imsg_get_fd(imsg);
 	if (fd == -1)
 		return got_error(GOT_ERR_PRIVSEP_NO_FD);
 
 	datalen = imsg->hdr.len - IMSG_HEADER_SIZE;
-	if (datalen < sizeof(ireq))
-		return got_error(GOT_ERR_PRIVSEP_LEN);
+	if (datalen < sizeof(ireq)) {
+		err = got_error(GOT_ERR_PRIVSEP_LEN);
+		goto done;
+	}
 
 	memcpy(&ireq, imsg->data, sizeof(ireq));
 
-	if (datalen != sizeof(ireq) +  ireq.refname_len)
-		return got_error(GOT_ERR_PRIVSEP_LEN);
+	if (datalen != sizeof(ireq) +  ireq.refname_len) {
+		err = got_error(GOT_ERR_PRIVSEP_LEN);
+		goto done;
+	}
 
 	refname = strndup(imsg->data + sizeof(ireq), ireq.refname_len);
-	if (refname == NULL)
-		return got_error_from_errno("strndup");
+	if (refname == NULL) {
+		err =  got_error_from_errno("strndup");
+		goto done;
+	}
 
 	switch (ireq.action) {
 	case GOTD_NOTIF_ACTION_CREATED:
@@ -2194,7 +2200,7 @@ render_notification(struct imsg *imsg, struct gotd_ims
 	gotd_imsg_event_add(iev);
 done:
 	free(refname);
-	if (close(fd) == -1 && err == NULL)
+	if (fd != -1 && close(fd) == -1 && err == NULL)
 		err = got_error_from_errno("close");
 	return err;
 }