X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tree-walk.c;h=142205ddc3e33fb8024171daf4c6b1bee1dba476;hb=ce2cf27adc434c11cd1e91bcacf00297efd8cc92;hp=cbb24eb3f663cd0370f528d983a2266a55b91c4f;hpb=4651ece8540a90a42af355e995847fb89192cc81;p=git.git

diff --git a/tree-walk.c b/tree-walk.c
index cbb24eb3f..142205ddc 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -7,6 +7,9 @@ static const char *get_mode(const char *str, unsigned int *modep)
 	unsigned char c;
 	unsigned int mode = 0;
 
+	if (*str == ' ')
+		return NULL;
+
 	while ((c = *str++) != ' ') {
 		if (c < '0' || c > '7')
 			return NULL;
@@ -16,13 +19,16 @@ static const char *get_mode(const char *str, unsigned int *modep)
 	return str;
 }
 
-static void decode_tree_entry(struct tree_desc *desc, const void *buf, unsigned long size)
+static void decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned long size)
 {
 	const char *path;
 	unsigned int mode, len;
 
+	if (size < 24 || buf[size - 21])
+		die("corrupt tree file");
+
 	path = get_mode(buf, &mode);
-	if (!path)
+	if (!path || !*path)
 		die("corrupt tree file");
 	len = strlen(path) + 1;
 
@@ -206,4 +212,3 @@ int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned ch
 	free(tree);
 	return retval;
 }
-