зеркало из https://github.com/microsoft/git.git
Merge branch 'md/list-objects-filter-memfix' into maint
The filter_data used in the list-objects-filter (which manages a lazily sparse clone repository) did not use the dynamic array API correctly---'nr' is supposed to point at one past the last element of the array in use. This has been corrected. * md/list-objects-filter-memfix: list-objects-filter: correct usage of ALLOC_GROW
This commit is contained in:
Коммит
43f40de940
|
@ -356,13 +356,13 @@ static enum list_objects_filter_result filter_sparse(
|
|||
filename, &dtype, &filter_data->el,
|
||||
r->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
|
||||
|
@ -387,16 +387,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;
|
||||
|
||||
/*
|
||||
|
@ -412,7 +411,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),
|
||||
|
@ -453,7 +452,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);
|
||||
}
|
||||
|
||||
|
@ -472,6 +471,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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче