Commit Diff

Commit:
6d0030ba1d9985fc8b8a9a2dc0f0c412c2c678da
From:
Kyle Ackerman <kackerman0102@gmail.com>
Via:
Omar Polo <op@omarpolo.com>
Date:
Message:
fix memory leak on error in got_privsep_recv_painted_commits() Diff from Kyle Ackerman, thank you! I've added a imsg_free() call before the break too.
Actions:
Patch | Tree
commit - 16efe7a78beaaca9c3c68128c40e6e9eec120a2d
commit + 6d0030ba1d9985fc8b8a9a2dc0f0c412c2c678da
blob - f95347425fd7aac62e8a966b665c1a3dca9997c2
blob + 2109bc13bcb9c7dbfb07021a640c5fa125e74954
--- lib/privsep.c
+++ lib/privsep.c
@@ -3510,22 +3510,32 @@ got_privsep_recv_painted_commits(struct got_object_id_
 
 	for (;;) {
 		err = got_privsep_recv_imsg(&imsg, ibuf, 0);
-		if (err)
+		if (err){
+			imsg_free(&imsg);
 			return err;
+		}
 
 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
-		if (imsg.hdr.type == GOT_IMSG_COMMIT_PAINTING_DONE)
-			break;
-		if (imsg.hdr.type != GOT_IMSG_PAINTED_COMMITS)
+		if (imsg.hdr.type == GOT_IMSG_COMMIT_PAINTING_DONE) {
+			imsg_free(&imsg);
+			break;
+		}
+		if (imsg.hdr.type != GOT_IMSG_PAINTED_COMMITS){
+			imsg_free(&imsg);
 			return got_error(GOT_ERR_PRIVSEP_MSG);
+		}
 
-		if (datalen < sizeof(icommits))
+		if (datalen < sizeof(icommits)){
+			imsg_free(&imsg);
 			return got_error(GOT_ERR_PRIVSEP_LEN);
+		}
 		memcpy(&icommits, imsg.data, sizeof(icommits));
 		if (icommits.ncommits * sizeof(icommit) < icommits.ncommits ||
 		    datalen < sizeof(icommits) +
-		    icommits.ncommits * sizeof(icommit))
+		    icommits.ncommits * sizeof(icommit)){
+			imsg_free(&imsg);
 			return got_error(GOT_ERR_PRIVSEP_LEN);
+		}
 
 		for (i = 0; i < icommits.ncommits; i++) {
 			memcpy(&icommit,