Merge branch 'ba/object-info'

gitster · gitster · commit cd6a1fc8a256 · 2021-09-10T11:46:26.000-07:00
Leakfix.

* ba/object-info:
  protocol-caps.c: fix memory leak in send_info()
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,`