scan-tree.c: avoid memory leak

[cgit.git] / scan-tree.c

diff --git a/scan-tree.c b/scan-tree.c
index a0e09ceac4212c1f8a07ca391d6bc67d6b0cb438..378d795e854a3965c38673939fd3785f6e3fe92e 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -155,28 +155,29 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
                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;
+       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);
-               return;
+               goto end;
        }
        if (is_git_dir(fmt("%s/.git", path))) {
                add_repo(base, fmt("%s/.git", path), fn);
-               return;
-       }
-       dir = opendir(path);
-       if (!dir) {
-               fprintf(stderr, "Error opening directory %s: %s (%d)\n",
-                       path, strerror(errno), errno);
-               return;
+               goto end;
        }
        while((ent = readdir(dir)) != NULL) {
                if (ent->d_name[0] == '.') {
@@ -184,6 +185,8 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
                                continue;
                        if (ent->d_name[1] == '.' && ent->d_name[2] == '\0')
                                continue;
+                       if (!ctx.cfg.scan_hidden_path)
+                               continue;
                }
                buf = malloc(strlen(path) + strlen(ent->d_name) + 2);
                if (!buf) {
@@ -202,6 +205,7 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
                        scan_path(base, buf, fn);
                free(buf);
        }
+end:
        closedir(dir);
 }
 
@@ -217,6 +221,7 @@ void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn
        if (!projects) {
                fprintf(stderr, "Error opening projectsfile %s: %s (%d)\n",
                        projectsfile, strerror(errno), errno);
+               return;
        }
        while (fgets(line, sizeof(line), projects) != NULL) {
                for (z = &lastc(line);