aboutsummaryrefslogtreecommitdiffstats
path: root/reftable
diff options
context:
space:
mode:
authorHan-Wen Nienhuys <hanwen@google.com>2022-02-21 18:46:05 +0000
committerJunio C Hamano <gitster@pobox.com>2022-02-23 13:36:26 -0800
commiteff5832ba13b81ebbf68b0c28934fe18ba8601fc (patch)
tree7b810a616913dc65bc89fd363dcb6755a9d21145 /reftable
parentfa48de62ac00bdd634ea5bcd5b1a6bccfa4d9117 (diff)
downloadgit-eff5832ba13b81ebbf68b0c28934fe18ba8601fc.tar.gz
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>
Diffstat (limited to 'reftable')
-rw-r--r--reftable/reader.c5
1 files changed, 5 insertions, 0 deletions
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;