summary refs log tree commit diff
diff options
context:
space:
mode:
authorSimon Arlott <simon@fire.lp0.eu>2009-03-07 00:06:24 +0000
committerLars Hjemli <hjemli@gmail.com>2009-08-18 14:27:41 +0200
commit011f2e9bdddcbfe65da397629bca87d167313a28 (patch)
tree606b84a7b0211a6c4536bb508d57d4f19d20c3ab
parent6421dc38db02eff8d3ada93e87a2f7e5292af131 (diff)
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>
-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
@@ -42,6 +42,7 @@ char *readfile(const char *path)
 
 	if (!(f = fopen(path, "r")))
 		return NULL;
+	buf[0] = 0;
 	fgets(buf, MAX_PATH, f);
 	fclose(f);
 	return buf;
diff --git a/ui-repolist.c b/ui-repolist.c
index 2c13d50..3aedde5 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -23,6 +23,7 @@ time_t read_agefile(char *path)
 
 	if (!(f = fopen(path, "r")))
 		return -1;
+	buf[0] = 0;
 	if (fgets(buf, sizeof(buf), f) == NULL)
 		return -1;
 	fclose(f);