tag: fix output of "tag -n" when errors occur

[git.git] / attr.c

diff --git a/attr.c b/attr.c
index a6e6523d29dcf021c4866660183f8442f44b7ff6..af4083582dce5cf63e95a8c485b57b3fa982f76a 100644 (file)
--- a/attr.c
+++ b/attr.c
@@ -286,6 +286,7 @@ static void free_attr_elem(struct attr_stack *e)
                }
                free(a);
        }
+       free(e->attrs);
        free(e);
 }
 
@@ -567,7 +568,9 @@ static void prepare_attr_stack(const char *path, int dirlen)
 
        /*
         * Pop the ones from directories that are not the prefix of
-        * the path we are checking.
+        * the path we are checking. Break out of the loop when we see
+        * the root one (whose origin is an empty string "") or the builtin
+        * one (whose origin is NULL) without popping it.
         */
        while (attr_stack->origin) {
                int namelen = strlen(attr_stack->origin);
@@ -587,6 +590,13 @@ static void prepare_attr_stack(const char *path, int dirlen)
         * Read from parent directories and push them down
         */
        if (!is_bare_repository() || direction == GIT_ATTR_INDEX) {
+               /*
+                * bootstrap_attr_stack() should have added, and the
+                * above loop should have stopped before popping, the
+                * root element whose attr_stack->origin is set to an
+                * empty string.
+                */
+               assert(attr_stack->origin);
                while (1) {
                        char *cp;