Be more careful about tree entry modes.

[git.git] / tree.c

diff --git a/tree.c b/tree.c
index 15a16d5..468f99e 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -101,9 +101,11 @@ int parse_tree(struct tree *item)
        if (!buffer)
                return error("Could not read %s",
                             sha1_to_hex(item->object.sha1));
-       if (strcmp(type, tree_type))
+       if (strcmp(type, tree_type)) {
+               free(buffer);
                return error("Object %s not a tree",
                             sha1_to_hex(item->object.sha1));
+       }
        list_p = &item->entries;
        while (size) {
                struct object *obj;
@@ -113,20 +115,19 @@ int parse_tree(struct tree *item)
                char *path = strchr(bufptr, ' ');
                unsigned int mode;
                if (size < len + 20 || !path || 
-                   sscanf(bufptr, "%o", &mode) != 1)
+                   sscanf(bufptr, "%o", &mode) != 1) {
+                       free(buffer);
                        return -1;
+               }
 
                entry = xmalloc(sizeof(struct tree_entry_list));
                entry->name = strdup(path + 1);
-               entry->directory = S_ISDIR(mode);
-               entry->executable = mode & S_IXUSR;
+               entry->directory = S_ISDIR(mode) != 0;
+               entry->executable = (mode & S_IXUSR) != 0;
+               entry->symlink = S_ISLNK(mode) != 0;
+               entry->mode = mode;
                entry->next = NULL;
 
-               /* Warn about trees that don't do the recursive thing.. */
-               if (strchr(path, '/')) {
-                       item->has_full_path = 1;
-               }
-
                bufptr += len + 20;
                size -= len + 20;
 
@@ -143,5 +144,6 @@ int parse_tree(struct tree *item)
                *list_p = entry;
                list_p = &entry->next;
        }
+       free(buffer);
        return 0;
 }