[PATCH v3 10/11] reftable: handle null refnames in reftable_ref_record_equal
From: Han-Wen Nienhuys via GitGitGadget <hidden>
Date: 2021-12-13 16:02:10
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Han-Wen Nienhuys <redacted> Spotted by Coverity. Signed-off-by: Han-Wen Nienhuys <redacted> --- reftable/record.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/reftable/record.c b/reftable/record.c
index 8536bd03aa9..8bbcbff1e69 100644
--- a/reftable/record.c
+++ b/reftable/record.c@@ -1154,9 +1154,11 @@ int reftable_ref_record_equal(struct reftable_ref_record *a, struct reftable_ref_record *b, int hash_size) { assert(hash_size > 0); - if (!(0 == strcmp(a->refname, b->refname) && - a->update_index == b->update_index && - a->value_type == b->value_type)) + if (!null_streq(a->refname, b->refname)) + return 0; + + if (a->update_index != b->update_index || + a->value_type != b->value_type) return 0; switch (a->value_type) {
--
gitgitgadget