diff options
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 5 | 
1 files changed, 5 insertions, 0 deletions
@@ -400,6 +400,7 @@ static void diff_words_show(struct diff_words_data *diff_words)  	mmfile_t minus, plus;  	int i; +	memset(&xpp, 0, sizeof(xpp));  	memset(&xecfg, 0, sizeof(xecfg));  	minus.size = diff_words->minus.text.size;  	minus.ptr = xmalloc(minus.size); @@ -1416,6 +1417,7 @@ static void builtin_diff(const char *name_a,  		if (!pe)  			pe = diff_funcname_pattern(two); +		memset(&xpp, 0, sizeof(xpp));  		memset(&xecfg, 0, sizeof(xecfg));  		memset(&ecbdata, 0, sizeof(ecbdata));  		ecbdata.label_path = lbl; @@ -1489,6 +1491,7 @@ static void builtin_diffstat(const char *name_a, const char *name_b,  		xdemitconf_t xecfg;  		xdemitcb_t ecb; +		memset(&xpp, 0, sizeof(xpp));  		memset(&xecfg, 0, sizeof(xecfg));  		xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;  		xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat, @@ -1535,6 +1538,7 @@ static void builtin_checkdiff(const char *name_a, const char *name_b,  		xdemitconf_t xecfg;  		xdemitcb_t ecb; +		memset(&xpp, 0, sizeof(xpp));  		memset(&xecfg, 0, sizeof(xecfg));  		xecfg.ctxlen = 1; /* at least one context line */  		xpp.flags = XDF_NEED_MINIMAL; @@ -2958,6 +2962,7 @@ static int diff_get_patch_id(struct diff_options *options, unsigned char *sha1)  		struct diff_filepair *p = q->queue[i];  		int len1, len2; +		memset(&xpp, 0, sizeof(xpp));  		memset(&xecfg, 0, sizeof(xecfg));  		if (p->status == 0)  			return error("internal diff status error");  | 
