summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Samson <samson.etienne@gmail.com>2016-12-26 14:47:55 +0100
committerEtienne Samson <samson.etienne@gmail.com>2017-01-13 21:48:20 +0100
commit8a349bf2a1e7257a4f35599b3613d7953289dc88 (patch)
tree24d645761c71ddf9cd517884ea17c4ad0851c945
parenta6d833a29e100cae66d5144367e9102d093d4dbd (diff)
downloadlibgit2-8a349bf2a1e7257a4f35599b3613d7953289dc88.tar.gz
ignore: there must be a repository
Otherwise we'll NULL-dereference in git_attr_cache__init
-rw-r--r--src/ignore.c6
1 files changed, 3 insertions, 3 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));