about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorSimon Arlott2009-03-07 00:06:24 +0000
committerLars Hjemli2009-08-18 14:27:41 +0200
commit011f2e9bdddcbfe65da397629bca87d167313a28 (patch)
tree606b84a7b0211a6c4536bb508d57d4f19d20c3ab
parentui-shared: don't print header <img/> if there isn't a logo defined (diff)
downloadcgit-011f2e9bdddcbfe65da397629bca87d167313a28.tar.gz
cgit-011f2e9bdddcbfe65da397629bca87d167313a28.zip
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)
42 42
43 if (!(f = fopen(path, "r"))) 43 if (!(f = fopen(path, "r")))
44 return NULL; 44 return NULL;
45 buf[0] = 0;
45 fgets(buf, MAX_PATH, f); 46 fgets(buf, MAX_PATH, f);
46 fclose(f); 47 fclose(f);
47 return buf; 48 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)
23 23
24 if (!(f = fopen(path, "r"))) 24 if (!(f = fopen(path, "r")))
25 return -1; 25 return -1;
26 buf[0] = 0;
26 if (fgets(buf, sizeof(buf), f) == NULL) 27 if (fgets(buf, sizeof(buf), f) == NULL)
27 return -1; 28 return -1;
28 fclose(f); 29 fclose(f);