diff options
| author | Lars Hjemli | 2011-07-22 12:22:17 +0000 |
|---|---|---|
| committer | Lars Hjemli | 2011-07-22 12:22:17 +0000 |
| commit | 756e3ea6392e30bcd0a41346d4ffa42c56d715e2 (patch) | |
| tree | 5b5da8cd867dfe801ecfc4c6c2c2b01a00cc4ea8 | |
| parent | Merge branch 'stable' (diff) | |
| parent | Fix potential XSS vulnerability in rename hint (diff) | |
| download | cgit-756e3ea6392e30bcd0a41346d4ffa42c56d715e2.tar.gz cgit-756e3ea6392e30bcd0a41346d4ffa42c56d715e2.zip | |
Merge branch 'stable'
| -rw-r--r-- | parsing.c | 2 | ||||
| -rw-r--r-- | ui-diff.c | 10 |
2 files changed, 7 insertions, 5 deletions
| diff --git a/parsing.c b/parsing.c index 151c0fe..602e3de 100644 --- a/parsing.c +++ b/parsing.c | |||
| @@ -125,7 +125,7 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc) | |||
| 125 | struct commitinfo *cgit_parse_commit(struct commit *commit) | 125 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
| 126 | { | 126 | { |
| 127 | struct commitinfo *ret; | 127 | struct commitinfo *ret; |
| 128 | char *p = commit->buffer, *t = commit->buffer; | 128 | char *p = commit->buffer, *t; |
| 129 | 129 | ||
| 130 | ret = xmalloc(sizeof(*ret)); | 130 | ret = xmalloc(sizeof(*ret)); |
| 131 | ret->commit = commit; | 131 | ret->commit = commit; |
| diff --git a/ui-diff.c b/ui-diff.c index 868ceec..d97a801 100644 --- a/ui-diff.c +++ b/ui-diff.c | |||
| @@ -97,10 +97,12 @@ static void print_fileinfo(struct fileinfo *info) | |||
| 97 | htmlf("</td><td class='%s'>", class); | 97 | htmlf("</td><td class='%s'>", class); |
| 98 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, | 98 | cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, |
| 99 | ctx.qry.sha2, info->new_path, 0); | 99 | ctx.qry.sha2, info->new_path, 0); |
| 100 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) | 100 | if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) { |
| 101 | htmlf(" (%s from %s)", | 101 | htmlf(" (%s from ", |
| 102 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", | 102 | info->status == DIFF_STATUS_COPIED ? "copied" : "renamed"); |
| 103 | info->old_path); | 103 | html_txt(info->old_path); |
| 104 | html(")"); | ||
| 105 | } | ||
| 104 | html("</td><td class='right'>"); | 106 | html("</td><td class='right'>"); |
| 105 | if (info->binary) { | 107 | if (info->binary) { |
| 106 | htmlf("bin</td><td class='graph'>%ld -> %ld bytes", | 108 | htmlf("bin</td><td class='graph'>%ld -> %ld bytes", |