diff options
| author | Jeff King <peff@peff.net> | 2016-02-22 23:44:35 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 23:51:09 +0100 |
| commit | 50a6c8efa2bbeddf46ca34c7765024108202e04b (patch) | |
| tree | 0c189695ed6ad8349527cb03d326ef3fb39707cf /fast-import.c | |
| parent | convert trivial cases to FLEX_ARRAY macros (diff) | |
| download | git-50a6c8efa2bbeddf46ca34c7765024108202e04b.tar.xz git-50a6c8efa2bbeddf46ca34c7765024108202e04b.zip | |
use st_add and st_mult for allocation size computation
If our size computation overflows size_t, we may allocate a
much smaller buffer than we expected and overflow it. It's
probably impossible to trigger an overflow in most of these
sites in practice, but it is easy enough convert their
additions and multiplications into overflow-checking
variants. This may be fixing real bugs, and it makes
auditing the code easier.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index 36dbaa5b16..9622b89df7 100644 --- a/fast-import.c +++ b/fast-import.c @@ -622,7 +622,7 @@ static void *pool_alloc(size_t len) return xmalloc(len); } total_allocd += sizeof(struct mem_pool) + mem_pool_alloc; - p = xmalloc(sizeof(struct mem_pool) + mem_pool_alloc); + p = xmalloc(st_add(sizeof(struct mem_pool), mem_pool_alloc)); p->next_pool = mem_pool; p->next_free = (char *) p->space; p->end = p->next_free + mem_pool_alloc; |