Merge branch 'js/unmap-before-ext-diff'

Windows update. * js/unmap-before-ext-diff: diff: munmap() file contents before running external diff
git · Jul 25, 2019 · d9beb46 · d9beb46
2 parents 43ba21c + 3aef54e
commit d9beb46
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/diff.c b/diff.c
@@ -4209,6 +4209,8 @@ static void run_external_diff(const char *pgm,
 	argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
 	argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
 
+	diff_free_filespec_data(one);
+	diff_free_filespec_data(two);
 	if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
 		die(_("external diff died, stopping at %s"), name);