Merge branch 'stable'

2 files changed, 2 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
@@ -21,48 +21,49 @@ static int is_git_dir(const char *path)
 	}
 	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);
diff --git a/ui-repolist.c b/ui-repolist.c
index 25f076f..6d2f93f 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -2,48 +2,49 @@
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 /* This is needed for strcasestr to be defined by <string.h> */
 #define _GNU_SOURCE 1
 #include <string.h>
 
 #include <time.h>
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 time_t read_agefile(char *path)
 {
 	FILE *f;
 	static char buf[64], buf2[64];
 
 	if (!(f = fopen(path, "r")))
 		return -1;
+	buf[0] = 0;
 	if (fgets(buf, sizeof(buf), f) == NULL)
 		return -1;
 	fclose(f);
 	if (parse_date(buf, buf2, sizeof(buf2)))
 		return strtoul(buf2, NULL, 10);
 	else
 		return 0;
 }
 
 static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
 {
 	char *path;
 	struct stat s;
 	struct cgit_repo *r = (struct cgit_repo *)repo;
 
 	if (repo->mtime != -1) {
 		*mtime = repo->mtime;
 		return 1;
 	}
 	path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
 	if (stat(path, &s) == 0) {
 		*mtime = read_agefile(path);
 		r->mtime = *mtime;
 		return 1;