Commit bdd478d6 authored by Matthew Daley's avatar Matthew Daley Committed by Junio C Hamano

Fix sizeof usage in get_permutations

Currently it gets the size of an otherwise unrelated, unused variable
instead of the expected struct size.
Signed-off-by: default avatarMatthew Daley <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 75940a00
...@@ -301,14 +301,14 @@ static void pll_free(struct pll *l) ...@@ -301,14 +301,14 @@ static void pll_free(struct pll *l)
*/ */
static struct pll * get_permutations(struct pack_list *list, int n) static struct pll * get_permutations(struct pack_list *list, int n)
{ {
struct pll *subset, *ret = NULL, *new_pll = NULL, *pll; struct pll *subset, *ret = NULL, *new_pll = NULL;
if (list == NULL || pack_list_size(list) < n || n == 0) if (list == NULL || pack_list_size(list) < n || n == 0)
return NULL; return NULL;
if (n == 1) { if (n == 1) {
while (list) { while (list) {
new_pll = xmalloc(sizeof(pll)); new_pll = xmalloc(sizeof(*new_pll));
new_pll->pl = NULL; new_pll->pl = NULL;
pack_list_insert(&new_pll->pl, list); pack_list_insert(&new_pll->pl, list);
new_pll->next = ret; new_pll->next = ret;
...@@ -321,7 +321,7 @@ static struct pll * get_permutations(struct pack_list *list, int n) ...@@ -321,7 +321,7 @@ static struct pll * get_permutations(struct pack_list *list, int n)
while (list->next) { while (list->next) {
subset = get_permutations(list->next, n - 1); subset = get_permutations(list->next, n - 1);
while (subset) { while (subset) {
new_pll = xmalloc(sizeof(pll)); new_pll = xmalloc(sizeof(*new_pll));
new_pll->pl = subset->pl; new_pll->pl = subset->pl;
pack_list_insert(&new_pll->pl, list); pack_list_insert(&new_pll->pl, list);
new_pll->next = ret; new_pll->next = ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment