Merge pull request #4051 from tiennou/clang-analyzer-1 Clang analyzer run
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
diff --git a/src/ignore.c b/src/ignore.c
index d1a6c55..cc9e08e 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 6dbb6cf..2e5de98 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 3559cc2..ab68f58 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) {