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>
Matthew DeVore committed
May 31, 2019 at 11:46 UTC
7140600e2e78f202594ebca09e3176b6fcac1625
1 file changed
+9
-8
list-objects-filter.c
+9
-8
@@ -270,13 +270,13 @@ static enum list_objects_filter_result filter_sparse(
270
filename, &dtype, &filter_data->el,
271
&the_index);
272
if (val < 0)
273
- val = filter_data->array_frame[filter_data->nr].defval;
273
+ val = filter_data->array_frame[filter_data->nr - 1].defval;
274
275
ALLOC_GROW(filter_data->array_frame, filter_data->nr + 1,
276
filter_data->alloc);
277
- filter_data->nr++;
277
filter_data->array_frame[filter_data->nr].defval = val;
278
filter_data->array_frame[filter_data->nr].child_prov_omit = 0;
279
+ filter_data->nr++;
280
281
/*
282
* A directory with this tree OID may appear in multiple
@@ -301,16 +301,15 @@ static enum list_objects_filter_result filter_sparse(
301
302
case LOFS_END_TREE:
303
assert(obj->type == OBJ_TREE);
304
- assert(filter_data->nr > 0);
304
+ assert(filter_data->nr > 1);
305
306
- frame = &filter_data->array_frame[filter_data->nr];
307
- filter_data->nr--;
306
+ frame = &filter_data->array_frame[--filter_data->nr];
307
308
/*
309
* Tell our parent directory if any of our children were
310
* provisionally omitted.
311
*/
313
- filter_data->array_frame[filter_data->nr].child_prov_omit |=
312
+ filter_data->array_frame[filter_data->nr - 1].child_prov_omit |=
313
frame->child_prov_omit;
314
315
/*
@@ -326,7 +325,7 @@ static enum list_objects_filter_result filter_sparse(
325
assert(obj->type == OBJ_BLOB);
326
assert((obj->flags & SEEN) == 0);
327
329
- frame = &filter_data->array_frame[filter_data->nr];
328
+ frame = &filter_data->array_frame[filter_data->nr - 1];
329
330
dtype = DT_REG;
331
val = is_excluded_from_list(pathname, strlen(pathname),
@@ -367,7 +366,7 @@ static enum list_objects_filter_result filter_sparse(
366
static void filter_sparse_free(void *filter_data)
367
{
368
struct filter_sparse_data *d = filter_data;
370
- /* TODO free contents of 'd' */
369
+ free(d->array_frame);
370
free(d);
371
}
372
@@ -386,6 +385,7 @@ static void *filter_sparse_oid__init(
385
ALLOC_GROW(d->array_frame, d->nr + 1, d->alloc);
386
d->array_frame[d->nr].defval = 0; /* default to include */
387
d->array_frame[d->nr].child_prov_omit = 0;
388
+ d->nr++;
389
390
*filter_fn = filter_sparse;
391
*filter_free_fn = filter_sparse_free;
@@ -407,6 +407,7 @@ static void *filter_sparse_path__init(
407
ALLOC_GROW(d->array_frame, d->nr + 1, d->alloc);
408
d->array_frame[d->nr].defval = 0; /* default to include */
409
d->array_frame[d->nr].child_prov_omit = 0;
410
+ d->nr++;
411
412
*filter_fn = filter_sparse;
413
*filter_free_fn = filter_sparse_free;