diff options
| author |  Jeff King <peff@peff.net> | 2016-02-22 17:44:32 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-02-22 14:51:09 -0800 |
| commit | 96ffc06f72f693d80f05059a1f0e5ca9007d5f1b (patch) | |
| tree | 8f4587b3132a422757280f3d4f7bc302230efd7c /builtin/blame.c | |
| parent | use xmallocz to avoid size arithmetic (diff) | |
| download | tgif-96ffc06f72f693d80f05059a1f0e5ca9007d5f1b.tar.xz | |
convert trivial cases to FLEX_ARRAY macros
Using FLEX_ARRAY macros reduces the amount of manual
computation size we have to do. It also ensures we don't
overflow size_t, and it makes sure we write the same number
of bytes that we allocated.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/blame.c')
| -rw-r--r-- | builtin/blame.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 4de9e10148..e175d86e56 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -459,13 +459,11 @@ static void queue_blames(struct scoreboard *sb, struct origin *porigin, static struct origin *make_origin(struct commit *commit, const char *path) { struct origin *o; - size_t pathlen = strlen(path) + 1; - o = xcalloc(1, sizeof(*o) + pathlen); + FLEX_ALLOC_STR(o, path, path); o->commit = commit; o->refcnt = 1; o->next = commit->util; commit->util = o; - memcpy(o->path, path, pathlen); /* includes NUL */ return o; } |