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) (unidiff)
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
@@ -146,24 +146,26 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
146 repo->name += strlen(repo->section); 146 repo->name += strlen(repo->section);
147 if (*repo->name == '/') 147 if (*repo->name == '/')
148 repo->name++; 148 repo->name++;
149 } 149 }
150 } 150 }
151 } 151 }
152 152
153 p = fmt("%s/cgitrc", path); 153 p = fmt("%s/cgitrc", path);
154 if (!stat(p, &st)) { 154 if (!stat(p, &st)) {
155 config_fn = fn; 155 config_fn = fn;
156 parse_configfile(xstrdup(p), &repo_config); 156 parse_configfile(xstrdup(p), &repo_config);
157 } 157 }
158
159 free(rel);
158} 160}
159 161
160static void scan_path(const char *base, const char *path, repo_config_fn fn) 162static void scan_path(const char *base, const char *path, repo_config_fn fn)
161{ 163{
162 DIR *dir = opendir(path); 164 DIR *dir = opendir(path);
163 struct dirent *ent; 165 struct dirent *ent;
164 char *buf; 166 char *buf;
165 struct stat st; 167 struct stat st;
166 168
167 if (!dir) { 169 if (!dir) {
168 fprintf(stderr, "Error opening directory %s: %s (%d)\n", 170 fprintf(stderr, "Error opening directory %s: %s (%d)\n",
169 path, strerror(errno), errno); 171 path, strerror(errno), errno);