summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-05-18 11:06:45 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-18 20:51:02 (UTC)
commit3de63b264c36888dfd42dfdf3fc0aad4ce0c2b5c (patch) (side-by-side diff)
tree6a6af99ad81e5dcecf0de6469d09f0d00789593e
parent72fa5c63f80262019d807658cc537c9897c4b1d1 (diff)
downloadcgit-3de63b264c36888dfd42dfdf3fc0aad4ce0c2b5c.zip
cgit-3de63b264c36888dfd42dfdf3fc0aad4ce0c2b5c.tar.gz
cgit-3de63b264c36888dfd42dfdf3fc0aad4ce0c2b5c.tar.bz2
Don't be fooled by trailing '/' in url-parameter
cgit_parse_url() didn't check if the path-part of urls contained a real path or just a trailing slash. This made the log-page die since the path filtering supplied an invalid path argument. This fixes it. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--parsing.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/parsing.c b/parsing.c
index a028625..4420e58 100644
--- a/parsing.c
+++ b/parsing.c
@@ -146,49 +146,50 @@ void cgit_parse_url(const char *url)
cgit_repo = NULL;
if (!url || url[0] == '\0')
return;
cgit_repo = cgit_get_repoinfo(url);
if (cgit_repo) {
cgit_query_repo = cgit_repo->url;
return;
}
cmd = strchr(url, '/');
while (!cgit_repo && cmd) {
cmd[0] = '\0';
cgit_repo = cgit_get_repoinfo(url);
if (cgit_repo == NULL) {
cmd[0] = '/';
cmd = strchr(cmd + 1, '/');
continue;
}
cgit_query_repo = cgit_repo->url;
p = strchr(cmd + 1, '/');
if (p) {
p[0] = '\0';
- cgit_query_path = xstrdup(p + 1);
+ if (p[1])
+ cgit_query_path = xstrdup(p + 1);
}
cgit_cmd = cgit_get_cmd_index(cmd + 1);
cgit_query_page = xstrdup(cmd + 1);
return;
}
}
char *substr(const char *head, const char *tail)
{
char *buf;
buf = xmalloc(tail - head + 1);
strncpy(buf, head, tail - head);
buf[tail - head] = '\0';
return buf;
}
struct commitinfo *cgit_parse_commit(struct commit *commit)
{
struct commitinfo *ret;
char *p = commit->buffer, *t = commit->buffer;
ret = xmalloc(sizeof(*ret));
ret->commit = commit;