diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-05-19 16:02:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-05-19 16:02:47 -0700 |
| commit | 2b3303166bb294cae6a321a5875331f3cc9e2ef6 (patch) | |
| tree | 5b27ff21cec9589fbea7d531a25a44598dbf0c2e | |
| parent | Merge branch 'jk/oidmap-cleanup' (diff) | |
| parent | reftable/writer: fix memory leak when `writer_index_hash()` fails (diff) | |
| download | git-2b3303166bb294cae6a321a5875331f3cc9e2ef6.tar.gz git-2b3303166bb294cae6a321a5875331f3cc9e2ef6.zip | |
Merge branch 'ly/reftable-writer-leakfix'
Leakfix.
* ly/reftable-writer-leakfix:
reftable/writer: fix memory leak when `writer_index_hash()` fails
reftable/writer: fix memory leak when `padded_write()` fails
Diffstat (limited to '')
| -rw-r--r-- | reftable/writer.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/reftable/writer.c b/reftable/writer.c index cb16f71be4..3b4ebdd6dc 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); @@ -256,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 { |