From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Mon, 16 Jul 2018 01:27:54 +0000 (+0000)
Subject: tree-walk: replace hard-coded constants with the_hash_algo
X-Git-Tag: v2.19.0-rc0~112^2~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/83e4b7571c7d78e8236ad87519b75a90e7902a34?hp=509f6f62a4b0dfd1c06dc2120ad06b9d50a1b64a

tree-walk: replace hard-coded constants with the_hash_algo

Remove the hard-coded 20-based values and replace them with uses of
the_hash_algo.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/tree-walk.c b/tree-walk.c
index 8f5090862b..c1f27086a9 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -26,8 +26,9 @@ static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned l
 {
 	const char *path;
 	unsigned int mode, len;
+	const unsigned hashsz = the_hash_algo->rawsz;
 
-	if (size < 23 || buf[size - 21]) {
+	if (size < hashsz + 3 || buf[size - (hashsz + 1)]) {
 		strbuf_addstr(err, _("too-short tree object"));
 		return -1;
 	}