Merge branch 'hn/reftable-coverity-fixes'
Problems identified by Coverity in the reftable code have been corrected. * hn/reftable-coverity-fixes: reftable: add print functions to the record types reftable: make reftable_record a tagged union reftable: remove outdated file reftable.c reftable: implement record equality generically reftable: make reftable-record.h function signatures const correct reftable: handle null refnames in reftable_ref_record_equal reftable: drop stray printf in readwrite_test reftable: order unittests by complexity reftable: all xxx_free() functions accept NULL arguments reftable: fix resource warning reftable: ignore remove() return value in stack_test.c reftable: check reftable_stack_auto_compact() return value reftable: fix resource leak blocksource.c reftable: fix resource leak in block.c error path reftable: fix OOB stack write in print functions
This commit is contained in:
@ -889,7 +889,7 @@ static int stack_compact_range(struct reftable_stack *st, int first, int last,
|
||||
struct strbuf new_table_path = STRBUF_INIT;
|
||||
int err = 0;
|
||||
int have_lock = 0;
|
||||
int lock_file_fd = 0;
|
||||
int lock_file_fd = -1;
|
||||
int compact_count = last - first + 1;
|
||||
char **listp = NULL;
|
||||
char **delete_on_success =
|
||||
@ -923,7 +923,7 @@ static int stack_compact_range(struct reftable_stack *st, int first, int last,
|
||||
}
|
||||
/* Don't want to write to the lock for now. */
|
||||
close(lock_file_fd);
|
||||
lock_file_fd = 0;
|
||||
lock_file_fd = -1;
|
||||
|
||||
have_lock = 1;
|
||||
err = stack_uptodate(st);
|
||||
@ -1031,7 +1031,7 @@ static int stack_compact_range(struct reftable_stack *st, int first, int last,
|
||||
goto done;
|
||||
}
|
||||
err = close(lock_file_fd);
|
||||
lock_file_fd = 0;
|
||||
lock_file_fd = -1;
|
||||
if (err < 0) {
|
||||
err = REFTABLE_IO_ERROR;
|
||||
unlink(new_table_path.buf);
|
||||
@ -1068,9 +1068,9 @@ done:
|
||||
listp++;
|
||||
}
|
||||
free_names(subtable_locks);
|
||||
if (lock_file_fd > 0) {
|
||||
if (lock_file_fd >= 0) {
|
||||
close(lock_file_fd);
|
||||
lock_file_fd = 0;
|
||||
lock_file_fd = -1;
|
||||
}
|
||||
if (have_lock) {
|
||||
unlink(lock_file_name.buf);
|
||||
|
Reference in New Issue
Block a user