diff options
| author | Christian Hesse | 2015-10-09 13:15:50 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld | 2015-10-09 14:04:27 +0200 |
| commit | f77e2a8cfaf07b25ddedd57348a1d957b048bbf5 (patch) | |
| tree | 3665e4bdb8f16401f43aeb309e9f8206ae2b2ded | |
| parent | cmd: fix resource leak: free allocation from cgit_currenturl and fmtalloc (diff) | |
| download | cgit-f77e2a8cfaf07b25ddedd57348a1d957b048bbf5.tar.gz cgit-f77e2a8cfaf07b25ddedd57348a1d957b048bbf5.zip | |
ui-shared: return value of cgit_hosturl is not const
Signed-off-by: Christian Hesse <mail@eworm.de>
| -rw-r--r-- | ui-shared.c | 6 | ||||
| -rw-r--r-- | ui-shared.h | 2 |
2 files changed, 4 insertions, 4 deletions
| diff --git a/ui-shared.c b/ui-shared.c index f6d38de..09c34fd 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
| @@ -54,14 +54,14 @@ const char *cgit_httpscheme(void) | |||
| 54 | return "http://"; | 54 | return "http://"; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | const char *cgit_hosturl(void) | 57 | char *cgit_hosturl(void) |
| 58 | { | 58 | { |
| 59 | if (ctx.env.http_host) | 59 | if (ctx.env.http_host) |
| 60 | return ctx.env.http_host; | 60 | return xstrdup(ctx.env.http_host); |
| 61 | if (!ctx.env.server_name) | 61 | if (!ctx.env.server_name) |
| 62 | return NULL; | 62 | return NULL; |
| 63 | if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80) | 63 | if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80) |
| 64 | return ctx.env.server_name; | 64 | return xstrdup(ctx.env.server_name); |
| 65 | return fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port); | 65 | return fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| diff --git a/ui-shared.h b/ui-shared.h index 4121416..474e0c5 100644 --- a/ui-shared.h +++ b/ui-shared.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #define UI_SHARED_H | 2 | #define UI_SHARED_H |
| 3 | 3 | ||
| 4 | extern const char *cgit_httpscheme(); | 4 | extern const char *cgit_httpscheme(); |
| 5 | extern const char *cgit_hosturl(); | 5 | extern char *cgit_hosturl(); |
| 6 | extern const char *cgit_rooturl(); | 6 | extern const char *cgit_rooturl(); |
| 7 | extern char *cgit_currenturl(); | 7 | extern char *cgit_currenturl(); |
| 8 | extern const char *cgit_loginurl(); | 8 | extern const char *cgit_loginurl(); |