diff options
| author | Edward Thomson <ethomson@github.com> | 2017-01-21 23:58:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-21 23:58:41 +0000 |
| commit | 185fe9c1c1f8ee03a41f47f4a498e4c64ba8ae25 (patch) | |
| tree | 4cbdfdd5d94f6c4c12d324ab099862ff7feba747 | |
| parent | 048c5ea7c084508358bc49e7f8131ebd6250a756 (diff) | |
| parent | 49be45a18941cfe2e98fa3312e52c7ef4119fdcb (diff) | |
| download | libgit2-185fe9c1c1f8ee03a41f47f4a498e4c64ba8ae25.tar.gz | |
Merge pull request #4051 from tiennou/clang-analyzer-1
Clang analyzer run
| -rw-r--r-- | src/ignore.c | 6 | ||||
| -rw-r--r-- | src/pack-objects.c | 2 | ||||
| -rw-r--r-- | src/patch_generate.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/ignore.c b/src/ignore.c index d1a6c5550..cc9e08e35 100644 --- a/src/ignore.c +++ b/src/ignore.c @@ -278,7 +278,7 @@ int git_ignore__for_path( int error = 0; const char *workdir = git_repository_workdir(repo); - assert(ignores && path); + assert(repo && ignores && path); memset(ignores, 0, sizeof(*ignores)); ignores->repo = repo; @@ -503,9 +503,9 @@ int git_ignore_path_is_ignored( unsigned int i; git_attr_file *file; - assert(ignored && pathname); + assert(repo && ignored && pathname); - workdir = repo ? git_repository_workdir(repo) : NULL; + workdir = git_repository_workdir(repo); memset(&path, 0, sizeof(path)); memset(&ignores, 0, sizeof(ignores)); diff --git a/src/pack-objects.c b/src/pack-objects.c index 6dbb6cf6c..2e5de98ab 100644 --- a/src/pack-objects.c +++ b/src/pack-objects.c @@ -1738,7 +1738,7 @@ int git_packbuilder_insert_walk(git_packbuilder *pb, git_revwalk *walk) if (error == GIT_ITEROVER) error = 0; - return 0; + return error; } int git_packbuilder_set_callbacks(git_packbuilder *pb, git_packbuilder_progress progress_cb, void *progress_cb_payload) diff --git a/src/patch_generate.c b/src/patch_generate.c index 3559cc2b8..ab68f5801 100644 --- a/src/patch_generate.c +++ b/src/patch_generate.c @@ -451,8 +451,10 @@ int git_diff_foreach( if (binary_cb || hunk_cb || data_cb) { if ((error = patch_generated_init(&patch, diff, idx)) != 0 || - (error = patch_generated_load(&patch, &xo.output)) != 0) + (error = patch_generated_load(&patch, &xo.output)) != 0) { + git_patch_free(&patch.base); return error; + } } if ((error = patch_generated_invoke_file_callback(&patch, &xo.output)) == 0) { |