tree-walk: replace hard-coded constants with the_hash_algo

bk2204 · gitster · commit 83e4b7571c7d · 2018-07-16T14:27:39.000-07:00
Remove the hard-coded 20-based values and replace them with uses of
the_hash_algo.

Signed-off-by: brian m. carlson &lt;sandals@crustytoothpaste.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,9 @@ static int decode_tree_entry(struct tree_desc desc, const char buf, unsigned l`
`26`	`26`	`{`
`27`	`27`	`const char *path;`
`28`	`28`	`unsigned int mode, len;`
	`29`	`+ const unsigned hashsz = the_hash_algo->rawsz;`
`29`	`30`
`30`		`- if (size < 23 \|\| buf[size - 21]) {`
	`31`	`+ if (size < hashsz + 3 \|\| buf[size - (hashsz + 1)]) {`
`31`	`32`	`strbuf_addstr(err, _("too-short tree object"));`
`32`	`33`	`return -1;`
`33`	`34`	`}`