author | Lars Hjemli <hjemli@gmail.com> | 2009-03-15 07:57:33 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-03-15 07:57:33 (UTC) |
commit | 6fddad7251021b307c8a3f70fdd2aa04c3f74eaa (patch) (side-by-side diff) | |
tree | 942bd640a13ac3290bc2b8b94279cf68cf404abd | |
parent | 112973615a78ce61fd6e767128df03b075be72ca (diff) | |
download | cgit-6fddad7251021b307c8a3f70fdd2aa04c3f74eaa.zip cgit-6fddad7251021b307c8a3f70fdd2aa04c3f74eaa.tar.gz cgit-6fddad7251021b307c8a3f70fdd2aa04c3f74eaa.tar.bz2 |
ui-snapshot: avoid segfault when no filename is specified
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-snapshot.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index f25613e..5372f5d 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -147,38 +147,49 @@ static const char *get_ref_from_filename(const char *url, const char *filename, } if (get_sha1(snapshot, sha1) == 0) return snapshot; snapshot = fmt("v%s", snapshot); if (get_sha1(snapshot, sha1) == 0) return snapshot; return NULL; } +void show_error(char *msg) +{ + ctx.page.mimetype = "text/html"; + cgit_print_http_headers(&ctx); + cgit_print_docstart(&ctx); + cgit_print_pageheader(&ctx); + cgit_print_error(msg); + cgit_print_docend(); +} + void cgit_print_snapshot(const char *head, const char *hex, const char *filename, int snapshots, int dwim) { const struct cgit_snapshot_format* f; char *prefix = NULL; + if (!filename) { + show_error("No snapshot name specified"); + return; + } + f = get_format(filename); if (!f) { - ctx.page.mimetype = "text/html"; - cgit_print_http_headers(&ctx); - cgit_print_docstart(&ctx); - cgit_print_pageheader(&ctx); - cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); - cgit_print_docend(); + show_error(xstrdup(fmt("Unsupported snapshot format: %s", + filename))); return; } if (!hex && dwim) { hex = get_ref_from_filename(ctx.repo->url, filename, f); if (hex == NULL) { html_status(404, "Not found", 0); return; } prefix = xstrdup(filename); prefix[strlen(filename) - strlen(f->suffix)] = '\0'; } |