about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2015-10-09 13:15:47 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2015-10-09 14:00:56 +0200
commitc5c0eb873e0b9e40ffc3e85b621310ee85059ceb (patch)
tree06a3a6e14a805de318635166912e8c3a1cc7c7ec
parentui-shared: fix resource leak: free allocation from cgit_fileurl (diff)
downloadcgit-pink-c5c0eb873e0b9e40ffc3e85b621310ee85059ceb.tar.gz
cgit-pink-c5c0eb873e0b9e40ffc3e85b621310ee85059ceb.zip
ui-shared: return value of cgit_currenturl is not const
Signed-off-by: Christian Hesse <mail@eworm.de>
-rw-r--r--ui-shared.c4
-rw-r--r--ui-shared.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/ui-shared.c b/ui-shared.c
index d9f8258..b739675 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -65,10 +65,10 @@ const char *cgit_hosturl(void)
 	return fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port);
 }
 
-const char *cgit_currenturl(void)
+char *cgit_currenturl(void)
 {
 	if (!ctx.qry.url)
-		return cgit_rooturl();
+		return xstrdup(cgit_rooturl());
 	const char *root = cgit_rooturl();
 	size_t len = strlen(root);
 	if (len && root[len - 1] == '/')
diff --git a/ui-shared.h b/ui-shared.h
index 246678b..4121416 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -4,7 +4,7 @@
 extern const char *cgit_httpscheme();
 extern const char *cgit_hosturl();
 extern const char *cgit_rooturl();
-extern const char *cgit_currenturl();
+extern char *cgit_currenturl();
 extern const char *cgit_loginurl();
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_fileurl(const char *reponame, const char *pagename,