Commit 8212e2d7d0fec7e53efddc7e23fc65798afa12a3
2011-02-07T18:25:23
Fix detection of working dir on repositories Signed-off-by: Vicent Marti <tanoku@gmail.com>
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 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102
diff --git a/src/repository.c b/src/repository.c
index 81d1125..226e20f 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -111,6 +111,8 @@ static int assign_repository_DIRs(git_repository *repo,
/* store GIT_DIR */
repo->path_repository = git__strdup(path_aux);
+ if (repo->path_repository == NULL)
+ return GIT_ENOMEM;
/* store GIT_OBJECT_DIRECTORY */
if (git_object_directory == NULL)
@@ -125,7 +127,8 @@ static int assign_repository_DIRs(git_repository *repo,
return GIT_ENOTFOUND;
repo->path_odb = git__strdup(path_aux);
-
+ if (repo->path_odb == NULL)
+ return GIT_ENOMEM;
/* store GIT_INDEX_FILE */
if (git_index_file == NULL)
@@ -140,7 +143,8 @@ static int assign_repository_DIRs(git_repository *repo,
return GIT_ENOTFOUND;
repo->path_index = git__strdup(path_aux);
-
+ if (repo->path_index == NULL)
+ return GIT_ENOMEM;
/* store GIT_WORK_TREE */
if (git_work_tree == NULL)
@@ -150,6 +154,8 @@ static int assign_repository_DIRs(git_repository *repo,
if (error < GIT_SUCCESS)
return error;
repo->path_workdir = git__strdup(path_aux);
+ if (repo->path_workdir == NULL)
+ return GIT_ENOMEM;
}
return GIT_SUCCESS;
@@ -173,12 +179,16 @@ static int guess_repository_DIRs(git_repository *repo, const char *repository_pa
path_len = strlen(path_aux);
repo->path_repository = git__strdup(path_aux);
+ if (repo->path_repository == NULL)
+ return GIT_ENOMEM;
/* objects database */
strcpy(path_aux + path_len, GIT_OBJECTS_DIR);
if (gitfo_isdir(path_aux) < GIT_SUCCESS)
return GIT_ENOTAREPO;
repo->path_odb = git__strdup(path_aux);
+ if (repo->path_odb == NULL)
+ return GIT_ENOMEM;
/* HEAD file */
strcpy(path_aux + path_len, GIT_HEAD_FILE);
@@ -191,17 +201,31 @@ static int guess_repository_DIRs(git_repository *repo, const char *repository_pa
return GIT_EINVALIDPATH;
if (strcmp(topdir, GIT_DIR) == 0) {
+ int workdir_len;
+
repo->is_bare = 0;
/* index file */
strcpy(path_aux + path_len, GIT_INDEX_FILE);
repo->path_index = git__strdup(path_aux);
+ if (repo->path_index == NULL)
+ return GIT_ENOMEM;
/* working dir */
- repo->path_workdir = git__dirname(path_aux);
- if (repo->path_workdir == NULL)
+ path_aux[path_len] = 0;
+ workdir_len = git__dirname_r(path_aux, GIT_PATH_MAX, path_aux);
+ if (workdir_len < 0)
return GIT_EINVALIDPATH;
+ if (path_aux[workdir_len - 1] != '/') {
+ path_aux[workdir_len] = '/';
+ path_aux[workdir_len + 1] = '\0';
+ }
+
+ repo->path_workdir = git__strdup(path_aux);
+ if (repo->path_workdir == NULL)
+ return GIT_ENOMEM;
+
} else {
repo->is_bare = 1;
repo->path_workdir = NULL;
@@ -611,6 +635,8 @@ static int repo_init_find_dir(repo_init *results, const char* path)
return GIT_ENOTAREPO;
results->path_repository = git__strdup(temp_path);
+ if (results->path_repository == NULL)
+ return GIT_ENOMEM;
return GIT_SUCCESS;
}