aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Fleischer <cgit@cryptocrack.de>2015-02-09 06:25:00 +0000
committerJason A. Donenfeld <Jason@zx2c4.com>2015-02-09 10:51:14 +0000
commitb66b16ed026c6f57ad8ae892c821d835113e7fb2 (patch)
tree604193d1a658df7e3ebec743f5210dae86c4f2e9
parent7358f63015a27d1c22816a3c1f734c3d4beed115 (diff)
downloadcgit-b66b16ed026c6f57ad8ae892c821d835113e7fb2.tar
cgit-b66b16ed026c6f57ad8ae892c821d835113e7fb2.tar.gz
cgit-b66b16ed026c6f57ad8ae892c821d835113e7fb2.zip
ui-clone.c: Fix path check
The starts_with() check was broken in two ways: For one thing, the parameters were passed in the wrong order, for another thing, starts_with() returns 1 if the string starts with the prefix (not 0). Note that this bug existed since commit 02a545e (Add support for cloning over http, 2008-08-06) but only pops in in corner cases. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
-rw-r--r--ui-clone.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-clone.c b/ui-clone.c
index 50569d6..1e6238d 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -63,8 +63,8 @@ static void send_file(char *path)
}
ctx.page.mimetype = "application/octet-stream";
ctx.page.filename = path;
- if (!starts_with(ctx.repo->path, path))
- ctx.page.filename += strlen(ctx.repo->path) + 1;
+ skip_prefix(path, ctx.repo->path, &ctx.page.filename);
+ skip_prefix(ctx.page.filename, "/", &ctx.page.filename);
cgit_print_http_headers();
html_include(path);
}