diff options
author | John Keeping | 2013-04-07 12:46:45 +0100 |
---|---|---|
committer | Jason A. Donenfeld | 2013-04-08 15:59:51 +0200 |
commit | 57d09bf448990b3a67436e928807e854e491756f (patch) | |
tree | f98b55d814936d416c42f9ca14067934c6e280bc | |
parent | Fix out-of-bounds memory accesses with virtual_root="" (diff) | |
download | cgit-57d09bf448990b3a67436e928807e854e491756f.tar.gz cgit-57d09bf448990b3a67436e928807e854e491756f.zip |
Mark char* fields in struct cgit_page as const
Signed-off-by: John Keeping <john@keeping.me.uk>
-rw-r--r-- | cgit.h | 12 | ||||
-rw-r--r-- | ui-plain.c | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/cgit.h b/cgit.h index fc3fc6f..7581cc1 100644 --- a/cgit.h +++ b/cgit.h | |||
@@ -245,13 +245,13 @@ struct cgit_page { | |||
245 | time_t modified; | 245 | time_t modified; |
246 | time_t expires; | 246 | time_t expires; |
247 | size_t size; | 247 | size_t size; |
248 | char *mimetype; | 248 | const char *mimetype; |
249 | char *charset; | 249 | const char *charset; |
250 | char *filename; | 250 | const char *filename; |
251 | char *etag; | 251 | const char *etag; |
252 | char *title; | 252 | const char *title; |
253 | int status; | 253 | int status; |
254 | char *statusmsg; | 254 | const char *statusmsg; |
255 | }; | 255 | }; |
256 | 256 | ||
257 | struct cgit_environment { | 257 | struct cgit_environment { |
diff --git a/ui-plain.c b/ui-plain.c index 4397a59..482d53a 100644 --- a/ui-plain.c +++ b/ui-plain.c | |||
@@ -100,8 +100,9 @@ static int print_object(const unsigned char *sha1, const char *path) | |||
100 | ctx.page.etag = sha1_to_hex(sha1); | 100 | ctx.page.etag = sha1_to_hex(sha1); |
101 | cgit_print_http_headers(&ctx); | 101 | cgit_print_http_headers(&ctx); |
102 | html_raw(buf, size); | 102 | html_raw(buf, size); |
103 | /* If we allocated this, then casting away const is safe. */ | ||
103 | if (freemime) | 104 | if (freemime) |
104 | free(ctx.page.mimetype); | 105 | free((char*) ctx.page.mimetype); |
105 | return 1; | 106 | return 1; |
106 | } | 107 | } |
107 | 108 | ||