author | Florian Pritz <bluewind@xssn.at> | 2010-02-01 16:55:37 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-02-27 11:47:57 (UTC) |
commit | 8d946079c5f51ce934ff5edf6333962c6061d8a5 (patch) (unidiff) | |
tree | 6d62be9c7f5e498f55a8c38f29b831fc3fc1d6b0 /ui-shared.c | |
parent | c86e206a9773f97dc6de6bbf45712bb304de3653 (diff) | |
download | cgit-8d946079c5f51ce934ff5edf6333962c6061d8a5.zip cgit-8d946079c5f51ce934ff5edf6333962c6061d8a5.tar.gz cgit-8d946079c5f51ce934ff5edf6333962c6061d8a5.tar.bz2 |
ui-shared.c: fix segfault when repo is empty
PATH_INFO="/$REPONAME/commit/?id=1" QUERY_STRING="id=1" ./cgit.cgi
triggers segfault when the repository is empty and therefore
ctx.qry.head is unset
Signed-off-by: Florian Pritz <bluewind@xssn.at>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-shared.c b/ui-shared.c index 4049a2b..8a7cc32 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -153,293 +153,293 @@ static void site_url(char *page, char *search, int ofs) | |||
153 | html("q="); | 153 | html("q="); |
154 | html_attr(search); | 154 | html_attr(search); |
155 | delim = "&"; | 155 | delim = "&"; |
156 | } | 156 | } |
157 | if (ofs) { | 157 | if (ofs) { |
158 | html(delim); | 158 | html(delim); |
159 | htmlf("ofs=%d", ofs); | 159 | htmlf("ofs=%d", ofs); |
160 | } | 160 | } |
161 | } | 161 | } |
162 | 162 | ||
163 | static void site_link(char *page, char *name, char *title, char *class, | 163 | static void site_link(char *page, char *name, char *title, char *class, |
164 | char *search, int ofs) | 164 | char *search, int ofs) |
165 | { | 165 | { |
166 | html("<a"); | 166 | html("<a"); |
167 | if (title) { | 167 | if (title) { |
168 | html(" title='"); | 168 | html(" title='"); |
169 | html_attr(title); | 169 | html_attr(title); |
170 | html("'"); | 170 | html("'"); |
171 | } | 171 | } |
172 | if (class) { | 172 | if (class) { |
173 | html(" class='"); | 173 | html(" class='"); |
174 | html_attr(class); | 174 | html_attr(class); |
175 | html("'"); | 175 | html("'"); |
176 | } | 176 | } |
177 | html(" href='"); | 177 | html(" href='"); |
178 | site_url(page, search, ofs); | 178 | site_url(page, search, ofs); |
179 | html("'>"); | 179 | html("'>"); |
180 | html_txt(name); | 180 | html_txt(name); |
181 | html("</a>"); | 181 | html("</a>"); |
182 | } | 182 | } |
183 | 183 | ||
184 | void cgit_index_link(char *name, char *title, char *class, char *pattern, | 184 | void cgit_index_link(char *name, char *title, char *class, char *pattern, |
185 | int ofs) | 185 | int ofs) |
186 | { | 186 | { |
187 | site_link(NULL, name, title, class, pattern, ofs); | 187 | site_link(NULL, name, title, class, pattern, ofs); |
188 | } | 188 | } |
189 | 189 | ||
190 | static char *repolink(char *title, char *class, char *page, char *head, | 190 | static char *repolink(char *title, char *class, char *page, char *head, |
191 | char *path) | 191 | char *path) |
192 | { | 192 | { |
193 | char *delim = "?"; | 193 | char *delim = "?"; |
194 | 194 | ||
195 | html("<a"); | 195 | html("<a"); |
196 | if (title) { | 196 | if (title) { |
197 | html(" title='"); | 197 | html(" title='"); |
198 | html_attr(title); | 198 | html_attr(title); |
199 | html("'"); | 199 | html("'"); |
200 | } | 200 | } |
201 | if (class) { | 201 | if (class) { |
202 | html(" class='"); | 202 | html(" class='"); |
203 | html_attr(class); | 203 | html_attr(class); |
204 | html("'"); | 204 | html("'"); |
205 | } | 205 | } |
206 | html(" href='"); | 206 | html(" href='"); |
207 | if (ctx.cfg.virtual_root) { | 207 | if (ctx.cfg.virtual_root) { |
208 | html_url_path(ctx.cfg.virtual_root); | 208 | html_url_path(ctx.cfg.virtual_root); |
209 | if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') | 209 | if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') |
210 | html("/"); | 210 | html("/"); |
211 | html_url_path(ctx.repo->url); | 211 | html_url_path(ctx.repo->url); |
212 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') | 212 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') |
213 | html("/"); | 213 | html("/"); |
214 | if (page) { | 214 | if (page) { |
215 | html_url_path(page); | 215 | html_url_path(page); |
216 | html("/"); | 216 | html("/"); |
217 | if (path) | 217 | if (path) |
218 | html_url_path(path); | 218 | html_url_path(path); |
219 | } | 219 | } |
220 | } else { | 220 | } else { |
221 | html(ctx.cfg.script_name); | 221 | html(ctx.cfg.script_name); |
222 | html("?url="); | 222 | html("?url="); |
223 | html_url_arg(ctx.repo->url); | 223 | html_url_arg(ctx.repo->url); |
224 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') | 224 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') |
225 | html("/"); | 225 | html("/"); |
226 | if (page) { | 226 | if (page) { |
227 | html_url_arg(page); | 227 | html_url_arg(page); |
228 | html("/"); | 228 | html("/"); |
229 | if (path) | 229 | if (path) |
230 | html_url_arg(path); | 230 | html_url_arg(path); |
231 | } | 231 | } |
232 | delim = "&"; | 232 | delim = "&"; |
233 | } | 233 | } |
234 | if (head && strcmp(head, ctx.repo->defbranch)) { | 234 | if (head && strcmp(head, ctx.repo->defbranch)) { |
235 | html(delim); | 235 | html(delim); |
236 | html("h="); | 236 | html("h="); |
237 | html_url_arg(head); | 237 | html_url_arg(head); |
238 | delim = "&"; | 238 | delim = "&"; |
239 | } | 239 | } |
240 | return fmt("%s", delim); | 240 | return fmt("%s", delim); |
241 | } | 241 | } |
242 | 242 | ||
243 | static void reporevlink(char *page, char *name, char *title, char *class, | 243 | static void reporevlink(char *page, char *name, char *title, char *class, |
244 | char *head, char *rev, char *path) | 244 | char *head, char *rev, char *path) |
245 | { | 245 | { |
246 | char *delim; | 246 | char *delim; |
247 | 247 | ||
248 | delim = repolink(title, class, page, head, path); | 248 | delim = repolink(title, class, page, head, path); |
249 | if (rev && strcmp(rev, ctx.qry.head)) { | 249 | if (rev && ctx.qry.head != NULL && strcmp(rev, ctx.qry.head)) { |
250 | html(delim); | 250 | html(delim); |
251 | html("id="); | 251 | html("id="); |
252 | html_url_arg(rev); | 252 | html_url_arg(rev); |
253 | } | 253 | } |
254 | html("'>"); | 254 | html("'>"); |
255 | html_txt(name); | 255 | html_txt(name); |
256 | html("</a>"); | 256 | html("</a>"); |
257 | } | 257 | } |
258 | 258 | ||
259 | void cgit_summary_link(char *name, char *title, char *class, char *head) | 259 | void cgit_summary_link(char *name, char *title, char *class, char *head) |
260 | { | 260 | { |
261 | reporevlink(NULL, name, title, class, head, NULL, NULL); | 261 | reporevlink(NULL, name, title, class, head, NULL, NULL); |
262 | } | 262 | } |
263 | 263 | ||
264 | void cgit_tag_link(char *name, char *title, char *class, char *head, | 264 | void cgit_tag_link(char *name, char *title, char *class, char *head, |
265 | char *rev) | 265 | char *rev) |
266 | { | 266 | { |
267 | reporevlink("tag", name, title, class, head, rev, NULL); | 267 | reporevlink("tag", name, title, class, head, rev, NULL); |
268 | } | 268 | } |
269 | 269 | ||
270 | void cgit_tree_link(char *name, char *title, char *class, char *head, | 270 | void cgit_tree_link(char *name, char *title, char *class, char *head, |
271 | char *rev, char *path) | 271 | char *rev, char *path) |
272 | { | 272 | { |
273 | reporevlink("tree", name, title, class, head, rev, path); | 273 | reporevlink("tree", name, title, class, head, rev, path); |
274 | } | 274 | } |
275 | 275 | ||
276 | void cgit_plain_link(char *name, char *title, char *class, char *head, | 276 | void cgit_plain_link(char *name, char *title, char *class, char *head, |
277 | char *rev, char *path) | 277 | char *rev, char *path) |
278 | { | 278 | { |
279 | reporevlink("plain", name, title, class, head, rev, path); | 279 | reporevlink("plain", name, title, class, head, rev, path); |
280 | } | 280 | } |
281 | 281 | ||
282 | void cgit_log_link(char *name, char *title, char *class, char *head, | 282 | void cgit_log_link(char *name, char *title, char *class, char *head, |
283 | char *rev, char *path, int ofs, char *grep, char *pattern, | 283 | char *rev, char *path, int ofs, char *grep, char *pattern, |
284 | int showmsg) | 284 | int showmsg) |
285 | { | 285 | { |
286 | char *delim; | 286 | char *delim; |
287 | 287 | ||
288 | delim = repolink(title, class, "log", head, path); | 288 | delim = repolink(title, class, "log", head, path); |
289 | if (rev && strcmp(rev, ctx.qry.head)) { | 289 | if (rev && strcmp(rev, ctx.qry.head)) { |
290 | html(delim); | 290 | html(delim); |
291 | html("id="); | 291 | html("id="); |
292 | html_url_arg(rev); | 292 | html_url_arg(rev); |
293 | delim = "&"; | 293 | delim = "&"; |
294 | } | 294 | } |
295 | if (grep && pattern) { | 295 | if (grep && pattern) { |
296 | html(delim); | 296 | html(delim); |
297 | html("qt="); | 297 | html("qt="); |
298 | html_url_arg(grep); | 298 | html_url_arg(grep); |
299 | delim = "&"; | 299 | delim = "&"; |
300 | html(delim); | 300 | html(delim); |
301 | html("q="); | 301 | html("q="); |
302 | html_url_arg(pattern); | 302 | html_url_arg(pattern); |
303 | } | 303 | } |
304 | if (ofs > 0) { | 304 | if (ofs > 0) { |
305 | html(delim); | 305 | html(delim); |
306 | html("ofs="); | 306 | html("ofs="); |
307 | htmlf("%d", ofs); | 307 | htmlf("%d", ofs); |
308 | delim = "&"; | 308 | delim = "&"; |
309 | } | 309 | } |
310 | if (showmsg) { | 310 | if (showmsg) { |
311 | html(delim); | 311 | html(delim); |
312 | html("showmsg=1"); | 312 | html("showmsg=1"); |
313 | } | 313 | } |
314 | html("'>"); | 314 | html("'>"); |
315 | html_txt(name); | 315 | html_txt(name); |
316 | html("</a>"); | 316 | html("</a>"); |
317 | } | 317 | } |
318 | 318 | ||
319 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 319 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
320 | char *rev) | 320 | char *rev) |
321 | { | 321 | { |
322 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { | 322 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { |
323 | name[ctx.cfg.max_msg_len] = '\0'; | 323 | name[ctx.cfg.max_msg_len] = '\0'; |
324 | name[ctx.cfg.max_msg_len - 1] = '.'; | 324 | name[ctx.cfg.max_msg_len - 1] = '.'; |
325 | name[ctx.cfg.max_msg_len - 2] = '.'; | 325 | name[ctx.cfg.max_msg_len - 2] = '.'; |
326 | name[ctx.cfg.max_msg_len - 3] = '.'; | 326 | name[ctx.cfg.max_msg_len - 3] = '.'; |
327 | } | 327 | } |
328 | reporevlink("commit", name, title, class, head, rev, NULL); | 328 | reporevlink("commit", name, title, class, head, rev, NULL); |
329 | } | 329 | } |
330 | 330 | ||
331 | void cgit_refs_link(char *name, char *title, char *class, char *head, | 331 | void cgit_refs_link(char *name, char *title, char *class, char *head, |
332 | char *rev, char *path) | 332 | char *rev, char *path) |
333 | { | 333 | { |
334 | reporevlink("refs", name, title, class, head, rev, path); | 334 | reporevlink("refs", name, title, class, head, rev, path); |
335 | } | 335 | } |
336 | 336 | ||
337 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 337 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, |
338 | char *rev, char *archivename) | 338 | char *rev, char *archivename) |
339 | { | 339 | { |
340 | reporevlink("snapshot", name, title, class, head, rev, archivename); | 340 | reporevlink("snapshot", name, title, class, head, rev, archivename); |
341 | } | 341 | } |
342 | 342 | ||
343 | void cgit_diff_link(char *name, char *title, char *class, char *head, | 343 | void cgit_diff_link(char *name, char *title, char *class, char *head, |
344 | char *new_rev, char *old_rev, char *path) | 344 | char *new_rev, char *old_rev, char *path) |
345 | { | 345 | { |
346 | char *delim; | 346 | char *delim; |
347 | 347 | ||
348 | delim = repolink(title, class, "diff", head, path); | 348 | delim = repolink(title, class, "diff", head, path); |
349 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { | 349 | if (new_rev && ctx.qry.head != NULL && strcmp(new_rev, ctx.qry.head)) { |
350 | html(delim); | 350 | html(delim); |
351 | html("id="); | 351 | html("id="); |
352 | html_url_arg(new_rev); | 352 | html_url_arg(new_rev); |
353 | delim = "&"; | 353 | delim = "&"; |
354 | } | 354 | } |
355 | if (old_rev) { | 355 | if (old_rev) { |
356 | html(delim); | 356 | html(delim); |
357 | html("id2="); | 357 | html("id2="); |
358 | html_url_arg(old_rev); | 358 | html_url_arg(old_rev); |
359 | } | 359 | } |
360 | html("'>"); | 360 | html("'>"); |
361 | html_txt(name); | 361 | html_txt(name); |
362 | html("</a>"); | 362 | html("</a>"); |
363 | } | 363 | } |
364 | 364 | ||
365 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 365 | void cgit_patch_link(char *name, char *title, char *class, char *head, |
366 | char *rev) | 366 | char *rev) |
367 | { | 367 | { |
368 | reporevlink("patch", name, title, class, head, rev, NULL); | 368 | reporevlink("patch", name, title, class, head, rev, NULL); |
369 | } | 369 | } |
370 | 370 | ||
371 | void cgit_stats_link(char *name, char *title, char *class, char *head, | 371 | void cgit_stats_link(char *name, char *title, char *class, char *head, |
372 | char *path) | 372 | char *path) |
373 | { | 373 | { |
374 | reporevlink("stats", name, title, class, head, NULL, path); | 374 | reporevlink("stats", name, title, class, head, NULL, path); |
375 | } | 375 | } |
376 | 376 | ||
377 | void cgit_object_link(struct object *obj) | 377 | void cgit_object_link(struct object *obj) |
378 | { | 378 | { |
379 | char *page, *shortrev, *fullrev, *name; | 379 | char *page, *shortrev, *fullrev, *name; |
380 | 380 | ||
381 | fullrev = sha1_to_hex(obj->sha1); | 381 | fullrev = sha1_to_hex(obj->sha1); |
382 | shortrev = xstrdup(fullrev); | 382 | shortrev = xstrdup(fullrev); |
383 | shortrev[10] = '\0'; | 383 | shortrev[10] = '\0'; |
384 | if (obj->type == OBJ_COMMIT) { | 384 | if (obj->type == OBJ_COMMIT) { |
385 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, | 385 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, |
386 | ctx.qry.head, fullrev); | 386 | ctx.qry.head, fullrev); |
387 | return; | 387 | return; |
388 | } else if (obj->type == OBJ_TREE) | 388 | } else if (obj->type == OBJ_TREE) |
389 | page = "tree"; | 389 | page = "tree"; |
390 | else if (obj->type == OBJ_TAG) | 390 | else if (obj->type == OBJ_TAG) |
391 | page = "tag"; | 391 | page = "tag"; |
392 | else | 392 | else |
393 | page = "blob"; | 393 | page = "blob"; |
394 | name = fmt("%s %s...", typename(obj->type), shortrev); | 394 | name = fmt("%s %s...", typename(obj->type), shortrev); |
395 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); | 395 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); |
396 | } | 396 | } |
397 | 397 | ||
398 | void cgit_print_date(time_t secs, char *format, int local_time) | 398 | void cgit_print_date(time_t secs, char *format, int local_time) |
399 | { | 399 | { |
400 | char buf[64]; | 400 | char buf[64]; |
401 | struct tm *time; | 401 | struct tm *time; |
402 | 402 | ||
403 | if (!secs) | 403 | if (!secs) |
404 | return; | 404 | return; |
405 | if(local_time) | 405 | if(local_time) |
406 | time = localtime(&secs); | 406 | time = localtime(&secs); |
407 | else | 407 | else |
408 | time = gmtime(&secs); | 408 | time = gmtime(&secs); |
409 | strftime(buf, sizeof(buf)-1, format, time); | 409 | strftime(buf, sizeof(buf)-1, format, time); |
410 | html_txt(buf); | 410 | html_txt(buf); |
411 | } | 411 | } |
412 | 412 | ||
413 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 413 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
414 | { | 414 | { |
415 | time_t now, secs; | 415 | time_t now, secs; |
416 | 416 | ||
417 | if (!t) | 417 | if (!t) |
418 | return; | 418 | return; |
419 | time(&now); | 419 | time(&now); |
420 | secs = now - t; | 420 | secs = now - t; |
421 | 421 | ||
422 | if (secs > max_relative && max_relative >= 0) { | 422 | if (secs > max_relative && max_relative >= 0) { |
423 | cgit_print_date(t, format, ctx.cfg.local_time); | 423 | cgit_print_date(t, format, ctx.cfg.local_time); |
424 | return; | 424 | return; |
425 | } | 425 | } |
426 | 426 | ||
427 | if (secs < TM_HOUR * 2) { | 427 | if (secs < TM_HOUR * 2) { |
428 | htmlf("<span class='age-mins'>%.0f min.</span>", | 428 | htmlf("<span class='age-mins'>%.0f min.</span>", |
429 | secs * 1.0 / TM_MIN); | 429 | secs * 1.0 / TM_MIN); |
430 | return; | 430 | return; |
431 | } | 431 | } |
432 | if (secs < TM_DAY * 2) { | 432 | if (secs < TM_DAY * 2) { |
433 | htmlf("<span class='age-hours'>%.0f hours</span>", | 433 | htmlf("<span class='age-hours'>%.0f hours</span>", |
434 | secs * 1.0 / TM_HOUR); | 434 | secs * 1.0 / TM_HOUR); |
435 | return; | 435 | return; |
436 | } | 436 | } |
437 | if (secs < TM_WEEK * 2) { | 437 | if (secs < TM_WEEK * 2) { |
438 | htmlf("<span class='age-days'>%.0f days</span>", | 438 | htmlf("<span class='age-days'>%.0f days</span>", |
439 | secs * 1.0 / TM_DAY); | 439 | secs * 1.0 / TM_DAY); |
440 | return; | 440 | return; |
441 | } | 441 | } |
442 | if (secs < TM_MONTH * 2) { | 442 | if (secs < TM_MONTH * 2) { |
443 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 443 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
444 | secs * 1.0 / TM_WEEK); | 444 | secs * 1.0 / TM_WEEK); |
445 | return; | 445 | return; |