aboutsummaryrefslogtreecommitdiff
path: root/userdiff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-08-20 10:15:27 -0700
committerJunio C Hamano <gitster@pobox.com>2024-08-20 10:15:27 -0700
commit2df380c2800b319be2587e301a82cc23656294e2 (patch)
tree2bd7ea3af4b286e54c80f712d6a779a6833f6676 /userdiff.h
parentbb9c16bd4f1a9a00799e10c81ee6506cf468c0c7 (diff)
parent77d4b3dd73c44b2c617345a6d9686d2f7f5b8a68 (diff)
downloadgit-2df380c2800b319be2587e301a82cc23656294e2.tar.xz
Merge branch 'ps/leakfixes-part-4' into ps/leakfixes-part-5
* ps/leakfixes-part-4: (22 commits) builtin/diff: free symmetric diff members diff: free state populated via options builtin/log: fix leak when showing converted blob contents userdiff: fix leaking memory for configured diff drivers builtin/format-patch: fix various trivial memory leaks diff: fix leak when parsing invalid ignore regex option unpack-trees: clear index when not propagating it sequencer: release todo list on error paths merge-ort: unconditionally release attributes index builtin/fast-export: plug leaking tag names builtin/fast-export: fix leaking diff options builtin/fast-import: plug trivial memory leaks builtin/notes: fix leaking `struct notes_tree` when merging notes builtin/rebase: fix leaking `commit.gpgsign` value config: fix leaking comment character config submodule-config: fix leaking name entry when traversing submodules read-cache: fix leaking hashfile when writing index fails bulk-checkin: fix leaking state TODO object-name: fix leaking symlink paths in object context object-file: fix memory leak when reading corrupted headers ...
Diffstat (limited to 'userdiff.h')
-rw-r--r--userdiff.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/userdiff.h b/userdiff.h
index 7565930337..827361b0bc 100644
--- a/userdiff.h
+++ b/userdiff.h
@@ -8,6 +8,7 @@ struct repository;
struct userdiff_funcname {
const char *pattern;
+ char *pattern_owned;
int cflags;
};
@@ -20,11 +21,14 @@ struct userdiff_driver {
const char *name;
struct external_diff external;
const char *algorithm;
+ char *algorithm_owned;
int binary;
struct userdiff_funcname funcname;
const char *word_regex;
+ char *word_regex_owned;
const char *word_regex_multi_byte;
const char *textconv;
+ char *textconv_owned;
struct notes_cache *textconv_cache;
int textconv_want_cache;
};