kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Matthew DeVore 2019-05-31 11:46:06 -07:00 committed by Junio C Hamano
parent 8b10a206f0
commit 7140600e2e
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
list-objects-filter.c
View File

@ -270,13 +270,13 @@ static enum list_objects_filter_result filter_sparse(
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);
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->nr++;

/*
* 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);
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.
*/
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;

/*
@ -326,7 +325,7 @@ static enum list_objects_filter_result filter_sparse(
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),
@ -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;
/* TODO free contents of 'd' */
free(d->array_frame);
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;
d->nr++;

*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;
d->nr++;

*filter_fn = filter_sparse;
*filter_free_fn = filter_sparse_free;