From: Han-Wen Nienhuys <hanwen@google.com>
Date: Thu, 20 Jan 2022 15:12:09 +0000 (+0000)
Subject: reftable: handle null refnames in reftable_ref_record_equal
X-Git-Tag: v2.36.0-rc0~154^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=049cdbb059c28051fb96e1aba56558acf4b597a2;p=thirdparty%2Fgit.git

reftable: handle null refnames in reftable_ref_record_equal

Spotted by Coverity.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/reftable/record.c b/reftable/record.c
index 8536bd03aa..8bbcbff1e6 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) {