protocol-caps.c: fix memory leak in send_info()

avar · gitster · commit 88682b016dcb · 2021-08-31T11:15:16.000-07:00
Fix a memory leak in a2ba162 (object-info: support for retrieving object info, 2021-04-20) which appears to have been based on a misunderstanding of how the pkt-line.c API works. There is no need to strdup() input to packet_writer_write(), it's just a printf()-like format function. This fixes a potentially large memory leak, since the number of OID lines the "object-info" call can be arbitrarily large (or a small one if the request is small). This makes t5701-git-serve.sh pass again under SANITIZE=leak, as it did before a2ba162. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Acked-by: Bruno Albuquerque <bga@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/protocol-caps.c b/protocol-caps.c
@@ -69,9 +69,10 @@ static void send_info(struct repository *r, struct packet_writer *writer,
 			}
 		}
 
-		packet_writer_write(writer, "%s",
-				    strbuf_detach(&send_buffer, NULL));
+		packet_writer_write(writer, "%s", send_buffer.buf);
+		strbuf_reset(&send_buffer);
 	}
+	strbuf_release(&send_buffer);
 }
 
 int cap_object_info(struct repository *r, struct strvec *keys,

Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,10 @@ static void send_info(struct repository r, struct packet_writer writer,`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- packet_writer_write(writer, "%s",`
`73`		`- strbuf_detach(&send_buffer, NULL));`
	`72`	`+ packet_writer_write(writer, "%s", send_buffer.buf);`
	`73`	`+ strbuf_reset(&send_buffer);`
`74`	`74`	`}`
	`75`	`+ strbuf_release(&send_buffer);`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`int cap_object_info(struct repository r, struct strvec keys,`