Resolve static check warnings in example code #5142
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pks-t
requested changes
Jun 27, 2019
| @@ -244,5 +244,5 @@ static void parse_opts(struct opts *o, int argc, char *argv[]) | |||
| } | |||
|
|
|||
| if (!o->dir) | |||
| usage("must specify directory to init", NULL); | |||
| usage("must specify directory to init", ""); | |||
There was a problem hiding this comment.
Yup, passing NULL to fprintf is definitely wrong
examples/merge.c
Outdated
| @@ -220,6 +220,7 @@ static int create_merge_commit(git_repository *repo, git_index *index, merge_opt | |||
| check_lg2(git_repository_head(&head_ref, repo), "failed to get repo HEAD", NULL); | |||
| if (resolve_refish(&merge_commit, repo, opts->heads[0])) { | |||
| fprintf(stderr, "failed to resolve refish %s", opts->heads[0]); | |||
| git_commit_free(*parents); | |||
There was a problem hiding this comment.
We'll have to call free(parents) here. We haven't yet populated the parents array, only allocated the array itself
|
Reading on |
pks-t
reviewed
Jun 27, 2019
examples/merge.c
Outdated
| @@ -220,6 +220,7 @@ static int create_merge_commit(git_repository *repo, git_index *index, merge_opt | |||
| check_lg2(git_repository_head(&head_ref, repo), "failed to get repo HEAD", NULL); | |||
| if (resolve_refish(&merge_commit, repo, opts->heads[0])) { | |||
| fprintf(stderr, "failed to resolve refish %s", opts->heads[0]); | |||
| free(*parents); | |||
There was a problem hiding this comment.
You need to free(parents), though, not the the first element of the parents array :) Note the missing *
There was a problem hiding this comment.
I haven't thought this low-level in awhile but I I think I get it now.
There's a reason I took "low hanging fruit" for a fix.
Using cppcheck on libgit2 sources indicated two warnings in example code. merge.c was reported as having a memory leak. Fix applied was to `free()` memory pointed to by `parents`. init.c was reported as having a null pointer dereference on variable arg. Function 'usage' was being called with a null variable. Changed supplied parameter to empty string.
pks-t
approved these changes
Jun 27, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Using cppcheck on libgit2 sources indicated two warnings in example code.
merge.cwas reported as having a memory leak. Fix applied was to apply git_commit_free to value of variableparents.init.cwas reported as having a null pointer dereference on variablearg. Functionusagewas being called with a null variable. Changed supplied parameter to empty string.