summaryrefslogtreecommitdiffabout
authorSimon Arlott <simon@fire.lp0.eu>2009-03-07 00:06:24 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-18 12:27:41 (UTC)
commit011f2e9bdddcbfe65da397629bca87d167313a28 (patch) (side-by-side diff)
tree606b84a7b0211a6c4536bb508d57d4f19d20c3ab
parent6421dc38db02eff8d3ada93e87a2f7e5292af131 (diff)
downloadcgit-011f2e9bdddcbfe65da397629bca87d167313a28.zip
cgit-011f2e9bdddcbfe65da397629bca87d167313a28.tar.gz
cgit-011f2e9bdddcbfe65da397629bca87d167313a28.tar.bz2
truncate buffer before reading empty files
If readfile() reads an empty file, fgets() won't truncate the buffer and it'll still contain the contents of the previously read file. [lh: fixed similar issue in ui-repolist.c] Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--scan-tree.c1
-rw-r--r--ui-repolist.c1
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
@@ -39,12 +39,13 @@ 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)
diff --git a/ui-repolist.c b/ui-repolist.c
index 2c13d50..3aedde5 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -20,12 +20,13 @@ 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