From c8e752eaeff299012b582507fed078a7cecbb7a3 Mon Sep 17 00:00:00 2001 From: Lidong Yan <502024330056@smail.nju.edu.cn> Date: Mon, 12 May 2025 12:49:03 +0000 Subject: reftable/writer: fix memory leak when `padded_write()` fails In reftable/writer.c:padded_write(), if w->writer failed, zeroed allocated in `reftable_calloc` will leak. w->writer could be `reftable_write_data` in reftable/stack.c, and could fail due to some write error. Simply add reftable_free(zeroed) will solve this problem. Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn> Signed-off-by: Junio C Hamano --- reftable/writer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/reftable/writer.c b/reftable/writer.c index f3ab1035d6..d71a56e8fc 100644 --- a/reftable/writer.c +++ b/reftable/writer.c @@ -57,8 +57,10 @@ static int padded_write(struct reftable_writer *w, uint8_t *data, size_t len, return -1; n = w->write(w->write_arg, zeroed, w->pending_padding); - if (n < 0) + if (n < 0) { + reftable_free(zeroed); return n; + } w->pending_padding = 0; reftable_free(zeroed); -- cgit v1.2.3 From 91db6c735dd1da215ae5e12506139f0aba5e426b Mon Sep 17 00:00:00 2001 From: Lidong Yan <502024330056@smail.nju.edu.cn> Date: Mon, 12 May 2025 12:49:04 +0000 Subject: reftable/writer: fix memory leak when `writer_index_hash()` fails In reftable/writer.c:writer_index_hash(), if `reftable_buf_add` failed, key allocated by `reftable_malloc` will not be insert into `obj_index_tree` thus leaks. Simple add reftable_free(key) will solve this problem. Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn> Signed-off-by: Junio C Hamano --- reftable/writer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/reftable/writer.c b/reftable/writer.c index d71a56e8fc..5de684b36f 100644 --- a/reftable/writer.c +++ b/reftable/writer.c @@ -258,8 +258,10 @@ static int writer_index_hash(struct reftable_writer *w, struct reftable_buf *has reftable_buf_reset(&key->hash); err = reftable_buf_add(&key->hash, hash->buf, hash->len); - if (err < 0) + if (err < 0) { + reftable_free(key); return err; + } tree_insert(&w->obj_index_tree, key, &obj_index_tree_node_compare); } else { -- cgit v1.2.3