merge-base, xdiff: zero out xpparam_t structures

kempniu · gitster · commit ec7967cfafd5 · 2020-10-20T12:53:26.000-07:00
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ń &lt;michal@isc.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,8 @@ static int fall_back_to_classic_diff(xpparam_t const xpp, xdfenv_t env,`
`235`	`235`	`int line1, int count1, int line2, int count2)`
`236`	`236`	`{`
`237`	`237`	`xpparam_t xpparam;`
	`238`	`+`
	`239`	`+ memset(&xpparam, 0, sizeof(xpparam));`
`238`	`240`	`xpparam.flags = xpp->flags & ~XDF_DIFF_ALGORITHM_MASK;`
`239`	`241`
`240`	`242`	`return xdl_fall_back_diff(env, &xpparam,`
Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,8 @@ static int fall_back_to_classic_diff(struct hashmap *map,`
`318`	`318`	`int line1, int count1, int line2, int count2)`
`319`	`319`	`{`
`320`	`320`	`xpparam_t xpp;`
	`321`	`+`
	`322`	`+ memset(&xpp, 0, sizeof(xpp));`
`321`	`323`	`xpp.flags = map->xpp->flags & ~XDF_DIFF_ALGORITHM_MASK;`
`322`	`324`
`323`	`325`	`return xdl_fall_back_diff(map->env, &xpp,`