cgit.c: fix caching keyed on PATH_INFO with no QUERY_STRING

When generating a hash for caching, ctx.qry.raw is used as key. And
since cgit_parse_url() zero-terminates it's argument (after the repo
path), ctx.qry.raw must xstrdup(ctx.qry.url).

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/cgit.c b/cgit.c
index 5816f3d..b0e1c44 100644
--- a/cgit.c
+++ b/cgit.c
@@ -446,113 +446,113 @@ static void cgit_parse_args(int argc, const char **argv)
 		if (!strncmp(argv[i], "--cache=", 8)) {
 			ctx.cfg.cache_root = xstrdup(argv[i]+8);
 		}
 		if (!strcmp(argv[i], "--nocache")) {
 			ctx.cfg.nocache = 1;
 		}
 		if (!strcmp(argv[i], "--nohttp")) {
 			ctx.env.no_http = "1";
 		}
 		if (!strncmp(argv[i], "--query=", 8)) {
 			ctx.qry.raw = xstrdup(argv[i]+8);
 		}
 		if (!strncmp(argv[i], "--repo=", 7)) {
 			ctx.qry.repo = xstrdup(argv[i]+7);
 		}
 		if (!strncmp(argv[i], "--page=", 7)) {
 			ctx.qry.page = xstrdup(argv[i]+7);
 		}
 		if (!strncmp(argv[i], "--head=", 7)) {
 			ctx.qry.head = xstrdup(argv[i]+7);
 			ctx.qry.has_symref = 1;
 		}
 		if (!strncmp(argv[i], "--sha1=", 7)) {
 			ctx.qry.sha1 = xstrdup(argv[i]+7);
 			ctx.qry.has_sha1 = 1;
 		}
 		if (!strncmp(argv[i], "--ofs=", 6)) {
 			ctx.qry.ofs = atoi(argv[i]+6);
 		}
 		if (!strncmp(argv[i], "--scan-tree=", 12)) {
 			scan++;
 			scan_tree(argv[i] + 12);
 		}
 	}
 	if (scan) {
 		qsort(cgit_repolist.repos, cgit_repolist.count,
 			sizeof(struct cgit_repo), cmp_repos);
 		print_repolist(&cgit_repolist);
 		exit(0);
 	}
 }
 
 static int calc_ttl()
 {
 	if (!ctx.repo)
 		return ctx.cfg.cache_root_ttl;
 
 	if (!ctx.qry.page)
 		return ctx.cfg.cache_repo_ttl;
 
 	if (ctx.qry.has_symref)
 		return ctx.cfg.cache_dynamic_ttl;
 
 	if (ctx.qry.has_sha1)
 		return ctx.cfg.cache_static_ttl;
 
 	return ctx.cfg.cache_repo_ttl;
 }
 
 int main(int argc, const char **argv)
 {
 	const char *path;
 	char *qry;
 	int err, ttl;
 
 	prepare_context(&ctx);
 	cgit_repolist.length = 0;
 	cgit_repolist.count = 0;
 	cgit_repolist.repos = NULL;
 
 	cgit_parse_args(argc, argv);
 	parse_configfile(ctx.env.cgit_config, config_cb);
 	ctx.repo = NULL;
 	http_parse_querystring(ctx.qry.raw, querystring_cb);
 
 	/* If virtual-root isn't specified in cgitrc, lets pretend
 	 * that virtual-root equals SCRIPT_NAME.
 	 */
 	if (!ctx.cfg.virtual_root)
 		ctx.cfg.virtual_root = ctx.cfg.script_name;
 
 	/* If no url parameter is specified on the querystring, lets
 	 * use PATH_INFO as url. This allows cgit to work with virtual
 	 * urls without the need for rewriterules in the webserver (as
 	 * long as PATH_INFO is included in the cache lookup key).
 	 */
 	path = ctx.env.path_info;
 	if (!ctx.qry.url && path) {
 		if (path[0] == '/')
 			path++;
 		ctx.qry.url = xstrdup(path);
 		if (ctx.qry.raw) {
 			qry = ctx.qry.raw;
 			ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry));
 			free(qry);
 		} else
-			ctx.qry.raw = ctx.qry.url;
+			ctx.qry.raw = xstrdup(ctx.qry.url);
 		cgit_parse_url(ctx.qry.url);
 	}
 
 	ttl = calc_ttl();
 	ctx.page.expires += ttl*60;
 	if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
 		ctx.cfg.nocache = 1;
 	if (ctx.cfg.nocache)
 		ctx.cfg.cache_size = 0;
 	err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
 			    ctx.qry.raw, ttl, process_request, &ctx);
 	if (err)
 		cgit_print_error(fmt("Error processing page: %s (%d)",
 				     strerror(err), err));
 	return err;
 }