proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-24 21:44:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

describe example: fix memory allocation size

Browse Source 
We need to allocate memory for sizeof(char *) * ncommits, not just for
ncommits.

Issue detected by GCC's AddressSanitizer.
This commit is contained in:
Boris Egorov 2015-01-25 22:34:46 +06:00
parent 73c5db7663
commit 36e13399c0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/describe.c
View File

@ -96,7 +96,8 @@ static void parse_options(describe_options *opts, int argc, char **argv)
const char *curr = argv[args.pos]; const char *curr = argv[args.pos];
if (curr[0] != '-') { 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; opts->commits[opts->commit_count - 1] = curr;
} else if (!strcmp(curr, "--all")) { } else if (!strcmp(curr, "--all")) {
opts->describe_options.describe_strategy = GIT_DESCRIBE_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 { else {
if (!opts->format_options.dirty_suffix || !opts->format_options.dirty_suffix[0]) { 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"; opts->commits[0] = "HEAD";
} }
} }