[Pkg-cgit-commits] [pkg-cgit] 01/01: Fix crash when using path limit

[Peter Colberg]

This is an automated email from the git hooks/post-receive script.

pc-guest pushed a commit to branch master
in repository pkg-cgit.

commit c4928fd592f04293ac6416ea947e9f501e830824
Author: Peter Colberg <peter at colberg.org>
Date:   Thu Nov 24 23:34:50 2016 -0500

    Fix crash when using path limit
---
 .../patches/fix-crash-when-using-path-limit.patch  | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 34 insertions(+)

diff --git a/debian/patches/fix-crash-when-using-path-limit.patch b/debian/patches/fix-crash-when-using-path-limit.patch
new file mode 100644
index 0000000..5193d61
--- /dev/null
+++ b/debian/patches/fix-crash-when-using-path-limit.patch
@@ -0,0 +1,33 @@
+Description: Fix crash when using path limit
+ The array passed to setup_revisions() must be NULL-terminated. Fixes a
+ regression introduced in 455b598 (ui-patch.c: Use log_tree_commit() to
+ generate diffs, 2013-08-20).
+Author: Lukas Fleischer <lfleischer at lfos.de>
+Bug: https://lists.zx2c4.com/pipermail/cgit/2016-November/003422.html
+Origin: https://lists.zx2c4.com/pipermail/cgit/2016-November/003431.html
+Last-Update: 2016-11-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/ui-patch.c
++++ b/ui-patch.c
+@@ -18,8 +18,8 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
+ 	struct commit *commit;
+ 	struct object_id new_rev_oid, old_rev_oid;
+ 	char rev_range[2 * 40 + 3];
+-	const char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range, "--", prefix };
+-	int rev_argc = ARRAY_SIZE(rev_argv);
++	const char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range, "--", prefix, NULL };
++	int rev_argc = ARRAY_SIZE(rev_argv) - 1;
+ 	char *patchname;
+ 
+ 	if (!prefix)
+@@ -85,8 +85,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
+ 			DIFF_FORMAT_PATCH | DIFF_FORMAT_SUMMARY;
+ 	if (prefix)
+ 		rev.diffopt.stat_sep = fmt("(limited to '%s')\n\n", prefix);
+-	setup_revisions(ARRAY_SIZE(rev_argv), rev_argv, &rev,
+-			NULL);
++	setup_revisions(rev_argc, rev_argv, &rev, NULL);
+ 	prepare_revision_walk(&rev);
+ 
+ 	while ((commit = get_revision(&rev)) != NULL) {
diff --git a/debian/patches/series b/debian/patches/series
index abf4fa9..21c9df8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ assume-highlight-version-3-in-filter-script.patch
 add-highlighting-rules-to-cgit.css.patch
 use-debian-binary-name-rst2html.patch
 syntax-highlighting.patch
+fix-crash-when-using-path-limit.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cgit/pkg-cgit.git