about summary refs log tree commit diff
path: root/shared.c
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2022-05-17 21:50:53 +0000
committerJune McEnroe <june@causal.agency>2022-05-17 21:50:53 +0000
commitcc167887f1ee6907103533187ff9679f01006a1f (patch)
tree2db55698195a71d19c0cf1a6e8658cc3b6768f9a /shared.c
parentBump version to 1.4.0 (diff)
downloadcgit-pink-cc167887f1ee6907103533187ff9679f01006a1f.tar.gz
cgit-pink-cc167887f1ee6907103533187ff9679f01006a1f.zip
Fix bad free in cgit_diff_tree
Since git commit 244c27242f44e6b88e3a381c90bde08d134c274b,

> diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)

calling diff_flush calls free(3) on opts.pathspec.items, so it can't
be a pointer to a stack variable.
Diffstat (limited to 'shared.c')
-rw-r--r--shared.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/shared.c b/shared.c
index 8115469..0bceb98 100644
--- a/shared.c
+++ b/shared.c
@@ -341,9 +341,8 @@ void cgit_diff_tree(const struct object_id *old_oid,
 		    filepair_fn fn, const char *prefix, int ignorews)
 {
 	struct diff_options opt;
-	struct pathspec_item item;
+	struct pathspec_item *item;
 
-	memset(&item, 0, sizeof(item));
 	diff_setup(&opt);
 	opt.output_format = DIFF_FORMAT_CALLBACK;
 	opt.detect_rename = 1;
@@ -354,10 +353,11 @@ void cgit_diff_tree(const struct object_id *old_oid,
 	opt.format_callback = cgit_diff_tree_cb;
 	opt.format_callback_data = fn;
 	if (prefix) {
-		item.match = xstrdup(prefix);
-		item.len = strlen(prefix);
+		item = xcalloc(1, sizeof(*item));
+		item->match = xstrdup(prefix);
+		item->len = strlen(prefix);
 		opt.pathspec.nr = 1;
-		opt.pathspec.items = &item;
+		opt.pathspec.items = item;
 	}
 	diff_setup_done(&opt);
 
@@ -367,8 +367,6 @@ void cgit_diff_tree(const struct object_id *old_oid,
 		diff_root_tree_oid(new_oid, "", &opt);
 	diffcore_std(&opt);
 	diff_flush(&opt);
-
-	free(item.match);
 }
 
 void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)