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) (unidiff) | |
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, | |||
147 | } | 147 | } |
148 | 148 | ||
149 | if (get_sha1(snapshot, sha1) == 0) | 149 | if (get_sha1(snapshot, sha1) == 0) |
150 | return snapshot; | 150 | return snapshot; |
151 | 151 | ||
152 | snapshot = fmt("v%s", snapshot); | 152 | snapshot = fmt("v%s", snapshot); |
153 | if (get_sha1(snapshot, sha1) == 0) | 153 | if (get_sha1(snapshot, sha1) == 0) |
154 | return snapshot; | 154 | return snapshot; |
155 | 155 | ||
156 | return NULL; | 156 | return NULL; |
157 | } | 157 | } |
158 | 158 | ||
159 | void show_error(char *msg) | ||
160 | { | ||
161 | ctx.page.mimetype = "text/html"; | ||
162 | cgit_print_http_headers(&ctx); | ||
163 | cgit_print_docstart(&ctx); | ||
164 | cgit_print_pageheader(&ctx); | ||
165 | cgit_print_error(msg); | ||
166 | cgit_print_docend(); | ||
167 | } | ||
168 | |||
159 | void cgit_print_snapshot(const char *head, const char *hex, | 169 | void cgit_print_snapshot(const char *head, const char *hex, |
160 | const char *filename, int snapshots, int dwim) | 170 | const char *filename, int snapshots, int dwim) |
161 | { | 171 | { |
162 | const struct cgit_snapshot_format* f; | 172 | const struct cgit_snapshot_format* f; |
163 | char *prefix = NULL; | 173 | char *prefix = NULL; |
164 | 174 | ||
175 | if (!filename) { | ||
176 | show_error("No snapshot name specified"); | ||
177 | return; | ||
178 | } | ||
179 | |||
165 | f = get_format(filename); | 180 | f = get_format(filename); |
166 | if (!f) { | 181 | if (!f) { |
167 | ctx.page.mimetype = "text/html"; | 182 | show_error(xstrdup(fmt("Unsupported snapshot format: %s", |
168 | cgit_print_http_headers(&ctx); | 183 | filename))); |
169 | cgit_print_docstart(&ctx); | ||
170 | cgit_print_pageheader(&ctx); | ||
171 | cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); | ||
172 | cgit_print_docend(); | ||
173 | return; | 184 | return; |
174 | } | 185 | } |
175 | 186 | ||
176 | if (!hex && dwim) { | 187 | if (!hex && dwim) { |
177 | hex = get_ref_from_filename(ctx.repo->url, filename, f); | 188 | hex = get_ref_from_filename(ctx.repo->url, filename, f); |
178 | if (hex == NULL) { | 189 | if (hex == NULL) { |
179 | html_status(404, "Not found", 0); | 190 | html_status(404, "Not found", 0); |
180 | return; | 191 | return; |
181 | } | 192 | } |
182 | prefix = xstrdup(filename); | 193 | prefix = xstrdup(filename); |
183 | prefix[strlen(filename) - strlen(f->suffix)] = '\0'; | 194 | prefix[strlen(filename) - strlen(f->suffix)] = '\0'; |
184 | } | 195 | } |