author | Simon 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) |
commit | 011f2e9bdddcbfe65da397629bca87d167313a28 (patch) (unidiff) | |
tree | 606b84a7b0211a6c4536bb508d57d4f19d20c3ab /scan-tree.c | |
parent | 6421dc38db02eff8d3ada93e87a2f7e5292af131 (diff) | |
download | cgit-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>
-rw-r--r-- | scan-tree.c | 1 |
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 | |||
@@ -33,24 +33,25 @@ static int is_git_dir(const char *path) | |||
33 | return 0; | 33 | return 0; |
34 | 34 | ||
35 | return 1; | 35 | return 1; |
36 | } | 36 | } |
37 | 37 | ||
38 | char *readfile(const char *path) | 38 | char *readfile(const char *path) |
39 | { | 39 | { |
40 | FILE *f; | 40 | FILE *f; |
41 | static char buf[MAX_PATH]; | 41 | static char buf[MAX_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; |
48 | } | 49 | } |
49 | 50 | ||
50 | static void add_repo(const char *base, const char *path) | 51 | static void add_repo(const char *base, const char *path) |
51 | { | 52 | { |
52 | struct cgit_repo *repo; | 53 | struct cgit_repo *repo; |
53 | struct stat st; | 54 | struct stat st; |
54 | struct passwd *pwd; | 55 | struct passwd *pwd; |
55 | char *p; | 56 | char *p; |
56 | 57 | ||