diff options
| author |   Robby Workman <rworkman@slackbuilds.org> | 2017-08-24 19:22:28 -0500 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-08-26 07:20:38 +0700 |
| commit | 4174da45a36fdf2f65914f22865dcc48433554c2 (patch) | |
| tree | 14e161231bc5a8675857dbd5e124af8cc5864659 /development/cgit/patches/0011-ui-atom-properly-escape-delimiter-in-page-link.patch | |
| parent | df75f0401ee693208abfaf397f480ae1f61862d1 (diff) | |
| download | slackbuilds-4174da45a36fdf2f65914f22865dcc48433554c2.tar.gz slackbuilds-4174da45a36fdf2f65914f22865dcc48433554c2.tar.xz | |
development/cgit: Include some upstream git patches
Some general bugfixes, but more importantly, patch 0005 fixes
a segfault in git's pathspec.c that we were seeing on the
SBo git server.
Thanks to John Keeping (cgit contributor) for helping with
debug suggestions and identifying the specific commit we
needed to fix it.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'development/cgit/patches/0011-ui-atom-properly-escape-delimiter-in-page-link.patch')
| -rw-r--r-- | development/cgit/patches/0011-ui-atom-properly-escape-delimiter-in-page-link.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/development/cgit/patches/0011-ui-atom-properly-escape-delimiter-in-page-link.patch b/development/cgit/patches/0011-ui-atom-properly-escape-delimiter-in-page-link.patch new file mode 100644 index 0000000000..2dbf661fc9 --- /dev/null +++ b/development/cgit/patches/0011-ui-atom-properly-escape-delimiter-in-page-link.patch @@ -0,0 +1,31 @@ +From 6d3c8bc37f6124c2193d66587079975d381aa435 Mon Sep 17 00:00:00 2001 +From: John Keeping <john@keeping.me.uk> +Date: Sun, 15 Jan 2017 12:29:38 +0000 +Subject: [PATCH 11/15] ui-atom: properly escape delimiter in page link + +If the delimiter here is '&' then it needs to be escaped for inclusion +in an attribute. Use html_attrf() to ensure that this happens (we know +that hex won't need escaping, but this makes it clearer what's +happening. + +Signed-off-by: John Keeping <john@keeping.me.uk> +--- + ui-atom.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ui-atom.c b/ui-atom.c +index 41838d3..3866823 100644 +--- a/ui-atom.c ++++ b/ui-atom.c +@@ -63,7 +63,7 @@ static void add_entry(struct commit *commit, const char *host) + html_attr(pageurl); + if (ctx.cfg.virtual_root) + delim = '?'; +- htmlf("%cid=%s", delim, hex); ++ html_attrf("%cid=%s", delim, hex); + html("'/>\n"); + free(pageurl); + } +-- +2.14.1 + |