list-objects-filter: correct usage of ALLOC_GROW

In the sparse filter data, array_frame array is used in a way such that
nr is the index of the last element. Fix this so that nr is actually the
number of elements in the array.

The filter_sparse_free function also has an unaddressed TODO to free the
memory associated with the sparse filter data. Address that TODO and fix
the memory leak.

Signed-off-by: Matthew DeVore <matvore@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/list-objects-filter.c b/list-objects-filter.c
index 765f3df3b067c5df7b98402ef4fc953edcd9179b..7824a480e18faad51b6c7161061f25c71c262b71 100644 (file)
--- a/list-objects-filter.c
+++ b/list-objects-filter.c
@@ -270,13 +270,13 @@ static enum list_objects_filter_result filter_sparse(
                                            filename, &dtype, &filter_data->el,
                                            &the_index);
                if (val < 0)
                                            filename, &dtype, &filter_data->el,
                                            &the_index);
                if (val < 0)

-                       val = filter_data->array_frame[filter_data->nr].defval;
+                       val = filter_data->array_frame[filter_data->nr - 1].defval;

 
                ALLOC_GROW(filter_data->array_frame, filter_data->nr + 1,
                           filter_data->alloc);
 
                ALLOC_GROW(filter_data->array_frame, filter_data->nr + 1,
                           filter_data->alloc);

-               filter_data->nr++;

                filter_data->array_frame[filter_data->nr].defval = val;
                filter_data->array_frame[filter_data->nr].child_prov_omit = 0;
                filter_data->array_frame[filter_data->nr].defval = val;
                filter_data->array_frame[filter_data->nr].child_prov_omit = 0;

+               filter_data->nr++;

 
                /*
                 * A directory with this tree OID may appear in multiple
 
                /*
                 * A directory with this tree OID may appear in multiple


@@ -301,16 +301,15 @@ static enum list_objects_filter_result filter_sparse(
 
        case LOFS_END_TREE:
                assert(obj->type == OBJ_TREE);
 
        case LOFS_END_TREE:
                assert(obj->type == OBJ_TREE);

-               assert(filter_data->nr > 0);
+               assert(filter_data->nr > 1);

 
 

-               frame = &filter_data->array_frame[filter_data->nr];
-               filter_data->nr--;
+               frame = &filter_data->array_frame[--filter_data->nr];

 
                /*
                 * Tell our parent directory if any of our children were
                 * provisionally omitted.
                 */
 
                /*
                 * Tell our parent directory if any of our children were
                 * provisionally omitted.
                 */

-               filter_data->array_frame[filter_data->nr].child_prov_omit |=
+               filter_data->array_frame[filter_data->nr - 1].child_prov_omit |=

                        frame->child_prov_omit;
 
                /*
                        frame->child_prov_omit;
 
                /*


@@ -326,7 +325,7 @@ static enum list_objects_filter_result filter_sparse(
                assert(obj->type == OBJ_BLOB);
                assert((obj->flags & SEEN) == 0);
 
                assert(obj->type == OBJ_BLOB);
                assert((obj->flags & SEEN) == 0);
 

-               frame = &filter_data->array_frame[filter_data->nr];
+               frame = &filter_data->array_frame[filter_data->nr - 1];

 
                dtype = DT_REG;
                val = is_excluded_from_list(pathname, strlen(pathname),
 
                dtype = DT_REG;
                val = is_excluded_from_list(pathname, strlen(pathname),


@@ -367,7 +366,7 @@ static enum list_objects_filter_result filter_sparse(
 static void filter_sparse_free(void *filter_data)
 {
        struct filter_sparse_data *d = filter_data;
 static void filter_sparse_free(void *filter_data)
 {
        struct filter_sparse_data *d = filter_data;

-       /* TODO free contents of 'd' */
+       free(d->array_frame);

        free(d);
 }
 
        free(d);
 }
 


@@ -386,6 +385,7 @@ static void *filter_sparse_oid__init(
        ALLOC_GROW(d->array_frame, d->nr + 1, d->alloc);
        d->array_frame[d->nr].defval = 0; /* default to include */
        d->array_frame[d->nr].child_prov_omit = 0;
        ALLOC_GROW(d->array_frame, d->nr + 1, d->alloc);
        d->array_frame[d->nr].defval = 0; /* default to include */
        d->array_frame[d->nr].child_prov_omit = 0;

+       d->nr++;

 
        *filter_fn = filter_sparse;
        *filter_free_fn = filter_sparse_free;
 
        *filter_fn = filter_sparse;
        *filter_free_fn = filter_sparse_free;


@@ -407,6 +407,7 @@ static void *filter_sparse_path__init(
        ALLOC_GROW(d->array_frame, d->nr + 1, d->alloc);
        d->array_frame[d->nr].defval = 0; /* default to include */
        d->array_frame[d->nr].child_prov_omit = 0;
        ALLOC_GROW(d->array_frame, d->nr + 1, d->alloc);
        d->array_frame[d->nr].defval = 0; /* default to include */
        d->array_frame[d->nr].child_prov_omit = 0;

+       d->nr++;

 
        *filter_fn = filter_sparse;
        *filter_free_fn = filter_sparse_free;
 
        *filter_fn = filter_sparse;
        *filter_free_fn = filter_sparse_free;