Skip to content

Commit 9329ae2

Browse files
committed
reftable/writer: fix memory leak if 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. 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 <[email protected]>
1 parent 6f84262 commit 9329ae2

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

reftable/writer.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ static int padded_write(struct reftable_writer *w, uint8_t *data, size_t len,
5757
return -1;
5858

5959
n = w->write(w->write_arg, zeroed, w->pending_padding);
60-
if (n < 0)
60+
if (n < 0) {
61+
reftable_free(zeroed);
6162
return n;
63+
}
6264

6365
w->pending_padding = 0;
6466
reftable_free(zeroed);
@@ -256,8 +258,10 @@ static int writer_index_hash(struct reftable_writer *w, struct reftable_buf *has
256258

257259
reftable_buf_reset(&key->hash);
258260
err = reftable_buf_add(&key->hash, hash->buf, hash->len);
259-
if (err < 0)
261+
if (err < 0) {
262+
reftable_free(key);
260263
return err;
264+
}
261265
tree_insert(&w->obj_index_tree, key,
262266
&obj_index_tree_node_compare);
263267
} else {

0 commit comments

Comments
 (0)