summaryrefslogtreecommitdiffabout
authorJamie Couture <jamie.couture@gmail.com>2011-06-03 23:21:01 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2011-06-06 19:10:31 (UTC)
commit2a8f553163d642e60092ced20631e1020581273b (patch) (side-by-side diff)
treea51ca48a4395abd80530851d0ca75629231ca14e
parentd885158f6ac29e04bd14dd132331c7e3a93e7490 (diff)
downloadcgit-2a8f553163d642e60092ced20631e1020581273b.zip
cgit-2a8f553163d642e60092ced20631e1020581273b.tar.gz
cgit-2a8f553163d642e60092ced20631e1020581273b.tar.bz2
scan-tree.c: avoid memory leak
No references are kept to the memory pointed to by the 'rel' variable, so it should be free()'d before returning from add_repo(). Signed-off-by: Jamie Couture <jamie.couture@gmail.com> Signed-off-by: Lars Hjemli <larsh@hjemli.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--scan-tree.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/scan-tree.c b/scan-tree.c
index e5a4baf..378d795 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -134,48 +134,50 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
while (slash && n && (slash = strchr(slash, '/')))
n--;
} else {
slash = rel + strlen(rel);
while (slash && n && (slash = xstrrchr(rel, slash, '/')))
n++;
}
if (slash && !n) {
*slash = '\0';
repo->section = xstrdup(rel);
*slash = '/';
if (!prefixcmp(repo->name, repo->section)) {
repo->name += strlen(repo->section);
if (*repo->name == '/')
repo->name++;
}
}
}
p = fmt("%s/cgitrc", path);
if (!stat(p, &st)) {
config_fn = fn;
parse_configfile(xstrdup(p), &repo_config);
}
+
+ free(rel);
}
static void scan_path(const char *base, const char *path, repo_config_fn fn)
{
DIR *dir = opendir(path);
struct dirent *ent;
char *buf;
struct stat st;
if (!dir) {
fprintf(stderr, "Error opening directory %s: %s (%d)\n",
path, strerror(errno), errno);
return;
}
if (is_git_dir(path)) {
add_repo(base, path, fn);
goto end;
}
if (is_git_dir(fmt("%s/.git", path))) {
add_repo(base, fmt("%s/.git", path), fn);
goto end;
}
while((ent = readdir(dir)) != NULL) {
if (ent->d_name[0] == '.') {