diff options
author | Boris Egorov <egorov@linux.com> | 2015-01-25 22:34:46 +0600 |
---|---|---|
committer | Boris Egorov <egorov@linux.com> | 2015-01-25 22:34:46 +0600 |
commit | 36e13399c030227d19523d19e3b75073a72cadb3 (patch) | |
tree | b67874a1be275a3a805af155f0483df1fbeee6b1 | |
parent | 73c5db7663b16f8aee2176ae8a5a4ed5127d5c35 (diff) | |
download | libgit2-36e13399c030227d19523d19e3b75073a72cadb3.tar.gz |
describe example: fix memory allocation size
We need to allocate memory for sizeof(char *) * ncommits, not just for
ncommits.
Issue detected by GCC's AddressSanitizer.
-rw-r--r-- | examples/describe.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/examples/describe.c b/examples/describe.c index 09a4fd008..72d981153 100644 --- a/examples/describe.c +++ b/examples/describe.c @@ -96,7 +96,8 @@ static void parse_options(describe_options *opts, int argc, char **argv) const char *curr = argv[args.pos]; if (curr[0] != '-') { - opts->commits = (const char **)realloc((void *)opts->commits, ++opts->commit_count); + size_t newsz = ++opts->commit_count * sizeof(opts->commits[0]); + opts->commits = (const char **)realloc((void *)opts->commits, newsz); opts->commits[opts->commit_count - 1] = curr; } else if (!strcmp(curr, "--all")) { opts->describe_options.describe_strategy = GIT_DESCRIBE_ALL; @@ -123,7 +124,8 @@ static void parse_options(describe_options *opts, int argc, char **argv) } else { if (!opts->format_options.dirty_suffix || !opts->format_options.dirty_suffix[0]) { - opts->commits = (const char **)malloc(++opts->commit_count); + size_t sz = ++opts->commit_count * sizeof(opts->commits[0]); + opts->commits = (const char **)malloc(sz); opts->commits[0] = "HEAD"; } } |