[PATCH] Fix crash when using path limit

[PATCH] Fix crash when using path limit

[lfleischer]

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).

Reported-by: Florian Pritz <bluewind at xinu.at>
Signed-off-by: Lukas Fleischer <lfleischer at lfos.de>
---
 ui-patch.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ui-patch.c b/ui-patch.c
index ec7f352..047e2f9 100644
--- 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) {
-- 
2.10.2

[PATCH] Fix crash when using path limit

[bluewind]

On 24.11.2016 20:16, Lukas Fleischer wrote:
> 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).
> 
> Reported-by: Florian Pritz <bluewind at xinu.at>
> Signed-off-by: Lukas Fleischer <lfleischer at lfos.de>

Works perfectly. Thanks!


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 825 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20161124/4aa56cf1/attachment.asc>

[PATCH] Fix crash when using path limit

[Jason]

Hi Lukas,

Seems fine to me. Queue it up.

Jason