Merge branch 'jk/reftable-leakfix' into jch

Leakfix.

* jk/reftable-leakfix:
  reftable: fix unlikely leak on API error
jch
Junio C Hamano 2026-07-01 10:48:33 -07:00
commit 5ae55383c8
1 changed files with 4 additions and 4 deletions

View File

@ -151,10 +151,6 @@ int reftable_writer_new(struct reftable_writer **out,
struct reftable_write_options opts = {0};
struct reftable_writer *wp;

wp = reftable_calloc(1, sizeof(*wp));
if (!wp)
return REFTABLE_OUT_OF_MEMORY_ERROR;

if (_opts)
opts = *_opts;
options_set_defaults(&opts);
@ -164,6 +160,10 @@ int reftable_writer_new(struct reftable_writer **out,
if (!hash_id)
hash_id = REFTABLE_HASH_SHA1;

wp = reftable_calloc(1, sizeof(*wp));
if (!wp)
return REFTABLE_OUT_OF_MEMORY_ERROR;

reftable_buf_init(&wp->block_writer_data.last_key);
reftable_buf_init(&wp->last_key);
reftable_buf_init(&wp->scratch);