about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLukas Fleischer <lfleischer@lfos.de>2016-11-24 20:14:54 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2017-01-23 18:36:04 +0100
commitbe39d22328f841536b8e44e8aaeed80a74ebb353 (patch)
treefb4e4cef05b2a4db7bdb2ebfc058fc2f6dd79454
parentsyntax-highlighting: replace invalid unicode with ? (diff)
downloadcgit-pink-be39d22328f841536b8e44e8aaeed80a74ebb353.tar.gz
cgit-pink-be39d22328f841536b8e44e8aaeed80a74ebb353.zip
ui-patch: 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).

Reported-by: Florian Pritz <bluewind@xinu.at>
Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
-rw-r--r--ui-patch.c7
1 files 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) {