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>

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
@@ -110,96 +110,98 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
                         fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",
                                 path, strerror(errno), errno);
                         break;
                 }
                 if (pwd->pw_gecos)
                         if ((p = strchr(pwd->pw_gecos, ',')))
                                 *p = '\0';
                 owner = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name);
         }
         repo->owner = owner;
 
         p = fmt("%s/description", path);
         if (!stat(p, &st))
                 readfile(p, &repo->desc, &size);
 
         if (!repo->readme) {
                 p = fmt("%s/README.html", path);
                 if (!stat(p, &st))
                         repo->readme = "README.html";
         }
         if (ctx.cfg.section_from_path) {
                 n  = ctx.cfg.section_from_path;
                 if (n > 0) {
                         slash = rel;
                         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] == '.') {
                         if (ent->d_name[1] == '\0')
                                 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) {
                         fprintf(stderr, "Alloc error on %s: %s (%d)\n",
                                 path, strerror(errno), errno);
                         exit(1);
                 }
                 sprintf(buf, "%s/%s", path, ent->d_name);
                 if (stat(buf, &st)) {
                         fprintf(stderr, "Error checking path %s: %s (%d)\n",
                                 buf, strerror(errno), errno);
                         free(buf);
                         continue;
                 }
                 if (S_ISDIR(st.st_mode))
                         scan_path(base, buf, fn);
                 free(buf);
         }