author | Lars Hjemli <hjemli@gmail.com> | 2008-07-27 10:32:08 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-07-27 10:32:08 (UTC) |
commit | 25c84326deff579d5de4b880f9dca2690bdc8569 (patch) (unidiff) | |
tree | 9ca41073e0e06e6dc24f7800182bf4a7b22f548c /cgit.c | |
parent | 2d6ee032d0c2f84ebcfaa12d3289e85cfab18fcd (diff) | |
download | cgit-25c84326deff579d5de4b880f9dca2690bdc8569.zip cgit-25c84326deff579d5de4b880f9dca2690bdc8569.tar.gz cgit-25c84326deff579d5de4b880f9dca2690bdc8569.tar.bz2 |
Be prepared for empty repositories
Before this patch, cgit would segfault on repositories with no refs.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -202,25 +202,29 @@ int find_current_ref(const char *refname, const unsigned char *sha1, | |||
202 | if (!info->first_ref) | 202 | if (!info->first_ref) |
203 | info->first_ref = xstrdup(refname); | 203 | info->first_ref = xstrdup(refname); |
204 | return info->match; | 204 | return info->match; |
205 | } | 205 | } |
206 | 206 | ||
207 | char *find_default_branch(struct cgit_repo *repo) | 207 | char *find_default_branch(struct cgit_repo *repo) |
208 | { | 208 | { |
209 | struct refmatch info; | 209 | struct refmatch info; |
210 | char *ref; | ||
210 | 211 | ||
211 | info.req_ref = repo->defbranch; | 212 | info.req_ref = repo->defbranch; |
212 | info.first_ref = NULL; | 213 | info.first_ref = NULL; |
213 | info.match = 0; | 214 | info.match = 0; |
214 | for_each_branch_ref(find_current_ref, &info); | 215 | for_each_branch_ref(find_current_ref, &info); |
215 | if (info.match) | 216 | if (info.match) |
216 | return info.req_ref; | 217 | ref = info.req_ref; |
217 | else | 218 | else |
218 | return info.first_ref; | 219 | ref = info.first_ref; |
220 | if (ref) | ||
221 | ref = xstrdup(ref); | ||
222 | return ref; | ||
219 | } | 223 | } |
220 | 224 | ||
221 | static int prepare_repo_cmd(struct cgit_context *ctx) | 225 | static int prepare_repo_cmd(struct cgit_context *ctx) |
222 | { | 226 | { |
223 | char *tmp; | 227 | char *tmp; |
224 | unsigned char sha1[20]; | 228 | unsigned char sha1[20]; |
225 | int nongit = 0; | 229 | int nongit = 0; |
226 | 230 | ||
@@ -236,17 +240,17 @@ static int prepare_repo_cmd(struct cgit_context *ctx) | |||
236 | cgit_print_pageheader(ctx); | 240 | cgit_print_pageheader(ctx); |
237 | cgit_print_error(tmp); | 241 | cgit_print_error(tmp); |
238 | cgit_print_docend(); | 242 | cgit_print_docend(); |
239 | return 1; | 243 | return 1; |
240 | } | 244 | } |
241 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); | 245 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
242 | 246 | ||
243 | if (!ctx->qry.head) { | 247 | if (!ctx->qry.head) { |
244 | ctx->qry.head = xstrdup(find_default_branch(ctx->repo)); | 248 | ctx->qry.head = find_default_branch(ctx->repo); |
245 | ctx->repo->defbranch = ctx->qry.head; | 249 | ctx->repo->defbranch = ctx->qry.head; |
246 | } | 250 | } |
247 | 251 | ||
248 | if (!ctx->qry.head) { | 252 | if (!ctx->qry.head) { |
249 | cgit_print_http_headers(ctx); | 253 | cgit_print_http_headers(ctx); |
250 | cgit_print_docstart(ctx); | 254 | cgit_print_docstart(ctx); |
251 | cgit_print_pageheader(ctx); | 255 | cgit_print_pageheader(ctx); |
252 | cgit_print_error("Repository seems to be empty"); | 256 | cgit_print_error("Repository seems to be empty"); |