about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2009-08-18 17:21:52 +0200
committerLars Hjemli2009-08-18 17:21:52 +0200
commit523c133e2e5f7089a3d18ac23f2074b60991a7f0 (patch)
treec6469d87baa282052884fcb02ab04c91b6d8783b
parentMerge branch 'stable' (diff)
parenttruncate buffer before reading empty files (diff)
downloadcgit-523c133e2e5f7089a3d18ac23f2074b60991a7f0.tar.gz
cgit-523c133e2e5f7089a3d18ac23f2074b60991a7f0.zip
Merge branch 'stable'
-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 25f076f..6d2f93f 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);