Skip to content


fixup! diff: munmap() file contents before running external diff
Browse files Browse the repository at this point in the history
  • Loading branch information
dscho committed Oct 5, 2017
1 parent cd8b22d commit 34c1a97
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions diff.c
Expand Up @@ -3094,9 +3094,9 @@ 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);

if (one->should_munmap)
if (one && one->should_munmap)
if (two->should_munmap)
if (two && two->should_munmap)
if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
die(_("external diff died, stopping at %s"), name);
Expand Down

0 comments on commit 34c1a97

Please sign in to comment.