diff options
| author | Jeff King <peff@peff.net> | 2016-02-22 17:44:35 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 14:51:09 -0800 |
| commit | 50a6c8efa2bbeddf46ca34c7765024108202e04b (patch) | |
| tree | 0c189695ed6ad8349527cb03d326ef3fb39707cf /revision.c | |
| parent | 96ffc06f72f693d80f05059a1f0e5ca9007d5f1b (diff) | |
| download | git-50a6c8efa2bbeddf46ca34c7765024108202e04b.tar.gz | |
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 'revision.c')
| -rw-r--r-- | revision.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c index 14daefb174..df56fcea0e 100644 --- a/revision.c +++ b/revision.c @@ -540,7 +540,7 @@ struct treesame_state { static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit) { unsigned n = commit_list_count(commit->parents); - struct treesame_state *st = xcalloc(1, sizeof(*st) + n); + struct treesame_state *st = xcalloc(1, st_add(sizeof(*st), n)); st->nparents = n; add_decoration(&revs->treesame, &commit->object, st); return st; |