Merge branch 'stable'

1 files changed, 1 insertions, 0 deletions

diff --git a/scan-tree.c b/scan-tree.c
index cdafb02..47f3988 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,92 +1,93 @@
 #include "cgit.h"
 #include "html.h"
 
 #define MAX_PATH 4096
 
 /* return 1 if path contains a objects/ directory and a HEAD file */
 static int is_git_dir(const char *path)
 {
 	struct stat st;
 	static char buf[MAX_PATH];
 
 	if (snprintf(buf, MAX_PATH, "%s/objects", path) >= MAX_PATH) {
 		fprintf(stderr, "Insanely long path: %s\n", path);
 		return 0;
 	}
 	if (stat(buf, &st)) {
 		if (errno != ENOENT)
 			fprintf(stderr, "Error checking path %s: %s (%d)\n",
 				path, strerror(errno), errno);
 		return 0;
 	}
 	if (!S_ISDIR(st.st_mode))
 		return 0;
 
 	sprintf(buf, "%s/HEAD", path);
 	if (stat(buf, &st)) {
 		if (errno != ENOENT)
 			fprintf(stderr, "Error checking path %s: %s (%d)\n",
 				path, strerror(errno), errno);
 		return 0;
 	}
 	if (!S_ISREG(st.st_mode))
 		return 0;
 
 	return 1;
 }
 
 char *readfile(const char *path)
 {
 	FILE *f;
 	static char buf[MAX_PATH];
 
 	if (!(f = fopen(path, "r")))
 		return NULL;
+	buf[0] = 0;
 	fgets(buf, MAX_PATH, f);
 	fclose(f);
 	return buf;
 }
 
 static void add_repo(const char *base, const char *path)
 {
 	struct cgit_repo *repo;
 	struct stat st;
 	struct passwd *pwd;
 	char *p;
 
 	if (stat(path, &st)) {
 		fprintf(stderr, "Error accessing %s: %s (%d)\n",
 			path, strerror(errno), errno);
 		return;
 	}
 	if ((pwd = getpwuid(st.st_uid)) == NULL) {
 		fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",
 			path, strerror(errno), errno);
 		return;
 	}
 	if (base == path)
 		p = fmt("%s", path);
 	else
 		p = fmt("%s", path + strlen(base) + 1);
 
 	if (!strcmp(p + strlen(p) - 5, "/.git"))
 		p[strlen(p) - 5] = '\0';
 
 	repo = cgit_add_repo(xstrdup(p));
 	repo->name = repo->url;
 	repo->path = xstrdup(path);
 	repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : "");
 
 	p = fmt("%s/description", path);
 	if (!stat(p, &st))
 		repo->desc = xstrdup(readfile(p));
 
 	p = fmt("%s/README.html", path);
 	if (!stat(p, &st))
 		repo->readme = "README.html";
 }
 
 static void scan_path(const char *base, const char *path)
 {
 	DIR *dir;
 	struct dirent *ent;