Skip to content

Commit

Permalink
fast-import: fix unalinged allocation and access
Browse files Browse the repository at this point in the history
The specialized pool allocator fast-import uses aligned objects on the
size of a pointer, which was not sufficient at least on Sparc.  Instead,
make the alignment for objects of type unitmax_t.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
davem330 authored and gitster committed Dec 15, 2007
1 parent 896c053 commit 69ae517
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions fast-import.c
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ struct mem_pool
struct mem_pool *next_pool;
char *next_free;
char *end;
char space[FLEX_ARRAY]; /* more */
uintmax_t space[FLEX_ARRAY]; /* more */
};

struct atom_str
Expand Down Expand Up @@ -534,15 +534,15 @@ static void *pool_alloc(size_t len)
total_allocd += sizeof(struct mem_pool) + mem_pool_alloc;
p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc);
p->next_pool = mem_pool;
p->next_free = p->space;
p->next_free = (char *) p->space;
p->end = p->next_free + mem_pool_alloc;
mem_pool = p;
}

r = p->next_free;
/* round out to a pointer alignment */
if (len & (sizeof(void*) - 1))
len += sizeof(void*) - (len & (sizeof(void*) - 1));
/* round out to a 'uintmax_t' alignment */
if (len & (sizeof(uintmax_t) - 1))
len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));
p->next_free += len;
return r;
}
Expand Down

0 comments on commit 69ae517

Please sign in to comment.