Commit Diff

Commit:
ad4a7050395834da81cd5e4715df04ebd5f06b6f
From:
Kyle Ackerman <kackerman0102@gmail.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
plug a memory leak in got_privsep_recv_send_remote_ref We didn't always call imsg_free(); while here also fix the `default` branch so it actually errors on unexpected messages. Diff from Kyle Ackerman with tweaks from tb@
Actions:
Patch | Tree
commit - 61800f5902cab09a880d4a23f072f3a1a010662f
commit + ad4a7050395834da81cd5e4715df04ebd5f06b6f
blob - 0a0080a069af4042d657c9e32643cfc47a716280
blob + 1f4393664a94a5cad668fbd22e01e5cb4c812d83
--- lib/privsep.c
+++ lib/privsep.c
@@ -941,13 +941,12 @@ got_privsep_recv_send_remote_refs(struct got_pathlist_
 	const struct got_error *err = NULL;
 	struct imsg imsg;
 	size_t datalen;
-	int done = 0;
 	struct got_imsg_send_remote_ref iremote_ref;
 	struct got_object_id *id = NULL;
 	char *refname = NULL;
 	struct got_pathlist_entry *new;
 
-	while (!done) {
+	while (1) {
 		err = got_privsep_recv_imsg(&imsg, ibuf, 0);
 		if (err)
 			return err;
@@ -986,6 +985,7 @@ got_privsep_recv_send_remote_refs(struct got_pathlist_
 			}
 			id = NULL;
 			refname = NULL;
+			imsg_free(&imsg);
 			break;
 		case GOT_IMSG_SEND_PACK_REQUEST:
 			if (datalen != 0) {
@@ -993,11 +993,10 @@ got_privsep_recv_send_remote_refs(struct got_pathlist_
 				goto done;
 			}
 			/* got-send-pack is now waiting for a pack file. */
-			done = 1;
-			break;
+			goto done;
 		default:
 			err = got_error(GOT_ERR_PRIVSEP_MSG);
-			break;
+			goto done;
 		}
 	}
 done: