Merge branch 'jk/imap-send-plug-all-msgs-leak'

gitster · gitster · commit 72576d139d73 · 2024-06-17T15:55:58.000-07:00
A leak in "git imap-send" that somehow escapes LSan has been
plugged.

* jk/imap-send-plug-all-msgs-leak:
  imap-send: free all_msgs strbuf in "out" label
diff --git a/imap-send.c b/imap-send.c
@@ -1555,7 +1555,6 @@ int cmd_main(int argc, const char **argv)
 	}
 
 	if (all_msgs.len == 0) {
-		strbuf_release(&all_msgs);
 		fprintf(stderr, "nothing to send\n");
 		ret = 1;
 		goto out;
@@ -1586,5 +1585,6 @@ int cmd_main(int argc, const char **argv)
 	free(server.user);
 	free(server.pass);
 	free(server.auth_method);
+	strbuf_release(&all_msgs);
 	return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -1555,7 +1555,6 @@ int cmd_main(int argc, const char **argv)`
`1555`	`1555`	`}`
`1556`	`1556`
`1557`	`1557`	`if (all_msgs.len == 0) {`
`1558`		`- strbuf_release(&all_msgs);`
`1559`	`1558`	`fprintf(stderr, "nothing to send\n");`
`1560`	`1559`	`ret = 1;`
`1561`	`1560`	`goto out;`
`@@ -1586,5 +1585,6 @@ int cmd_main(int argc, const char **argv)`
`1586`	`1585`	`free(server.user);`
`1587`	`1586`	`free(server.pass);`
`1588`	`1587`	`free(server.auth_method);`
	`1588`	`+ strbuf_release(&all_msgs);`
`1589`	`1589`	`return ret;`
`1590`	`1590`	`}`