summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Kępień <michal@isc.org>2020-10-20 06:48:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-10-20 19:53:26 (GMT)
commitec7967cfafd5844e33afbc1e6fb8ba1b9e5b111b (patch)
treefbe510604f80b470f7ab46871eb1e43e7a1903d9
parent47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc (diff)
downloadgit-ec7967cfafd5844e33afbc1e6fb8ba1b9e5b111b.zip
git-ec7967cfafd5844e33afbc1e6fb8ba1b9e5b111b.tar.gz
git-ec7967cfafd5844e33afbc1e6fb8ba1b9e5b111b.tar.bz2
merge-base, xdiff: zero out xpparam_t structures
xpparam_t structures are usually zero-initialized before their specific fields are assigned to, but there are three locations in the tree where that does not happen. Add the missing memset() calls in order to make initialization of xpparam_t structures consistent tree-wide and to prevent stack garbage from being used as field values. Signed-off-by: Michał Kępień <michal@isc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/merge-tree.c1
-rw-r--r--xdiff/xhistogram.c2
-rw-r--r--xdiff/xpatience.c2
3 files changed, 5 insertions, 0 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index e72714a..de85207 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -109,6 +109,7 @@ static void show_diff(struct merge_list *entry)
xdemitconf_t xecfg;
xdemitcb_t ecb;
+ memset(&xpp, 0, sizeof(xpp));
xpp.flags = 0;
memset(&xecfg, 0, sizeof(xecfg));
xecfg.ctxlen = 3;
diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c
index c7b35a9..e694bfd 100644
--- a/xdiff/xhistogram.c
+++ b/xdiff/xhistogram.c
@@ -235,6 +235,8 @@ static int fall_back_to_classic_diff(xpparam_t const *xpp, xdfenv_t *env,
int line1, int count1, int line2, int count2)
{
xpparam_t xpparam;
+
+ memset(&xpparam, 0, sizeof(xpparam));
xpparam.flags = xpp->flags & ~XDF_DIFF_ALGORITHM_MASK;
return xdl_fall_back_diff(env, &xpparam,
diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c
index 3c5601b..20699a6 100644
--- a/xdiff/xpatience.c
+++ b/xdiff/xpatience.c
@@ -318,6 +318,8 @@ static int fall_back_to_classic_diff(struct hashmap *map,
int line1, int count1, int line2, int count2)
{
xpparam_t xpp;
+
+ memset(&xpp, 0, sizeof(xpp));
xpp.flags = map->xpp->flags & ~XDF_DIFF_ALGORITHM_MASK;
return xdl_fall_back_diff(map->env, &xpp,