From eb14609dc46461728a065c0a243b338fc32fd762 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sun, 11 Jan 2009 21:23:04 +0100 Subject: [PATCH] Avoid SEGFAULT on invalid requests When an unknown page is requested, either on the querystring or via PATH_INFO, we end up with a null-referencing cgit_cmd. This null- pointer is then used as argument to the hc() function (which decides what tab to render as 'active'), but this function failed to check if a valid cmd was specified and a SEGFAULT would occur. This patch fixes the issue by introducing a 'fallback-cmd' which specifies what tab to render as 'active' when no valid cmd is requested. While at it, we now also keep track of the active repository even if an invalid cmd was requested since we want to show the error message about the invalid request in the correct context. Noticed-by: Robin Redeker Signed-off-by: Lars Hjemli --- cgit.c | 1 - ui-shared.c | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cgit.c b/cgit.c index c82587b..6e5215e 100644 --- a/cgit.c +++ b/cgit.c @@ -289,7 +289,6 @@ static void process_request(void *cbdata) cmd = cgit_get_cmd(ctx); if (!cmd) { ctx->page.title = "cgit error"; - ctx->repo = NULL; cgit_print_http_headers(ctx); cgit_print_docstart(ctx); cgit_print_pageheader(ctx); diff --git a/ui-shared.c b/ui-shared.c index 224e5f3..76cd00d 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -577,15 +577,20 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page) } } +const char *fallback_cmd = "repolist"; + char *hc(struct cgit_cmd *cmd, const char *page) { - return (strcmp(cmd->name, page) ? NULL : "active"); + return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); } void cgit_print_pageheader(struct cgit_context *ctx) { struct cgit_cmd *cmd = cgit_get_cmd(ctx); + if (!cmd && ctx->repo) + fallback_cmd = "summary"; + html("\n"); html("\n"); html("