From: Han-Wen Nienhuys <hanwen@google.com>
Date: Mon, 21 Feb 2022 18:46:05 +0000 (+0000)
Subject: reftable: reject 0 object_id_len
X-Git-Tag: v2.36.0-rc0~83^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eff5832ba13b81ebbf68b0c28934fe18ba8601fc;p=thirdparty%2Fgit.git

reftable: reject 0 object_id_len

The spec says 2 <= object_id_len <= 31. We are lenient and allow 1,
but we forbid 0, so we can be sure that we never read a 0-length key.

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

diff --git a/reftable/reader.c b/reftable/reader.c
index 00906e7a2d..54b4025105 100644
--- a/reftable/reader.c
+++ b/reftable/reader.c
@@ -155,6 +155,11 @@ static int parse_footer(struct reftable_reader *r, uint8_t *footer,
 	r->log_offsets.is_present = (first_block_typ == BLOCK_TYPE_LOG ||
 				     r->log_offsets.offset > 0);
 	r->obj_offsets.is_present = r->obj_offsets.offset > 0;
+	if (r->obj_offsets.is_present && !r->object_id_len) {
+		err = REFTABLE_FORMAT_ERROR;
+		goto done;
+	}
+
 	err = 0;
 done:
 	return err;