Skip to content

Commit 6776a84

Browse files
kgybelsgitster
authored andcommitted
diff: ensure correct lifetime of external_diff_cmd
According to getenv(3)'s notes: The implementation of getenv() is not required to be reentrant. The string pointed to by the return value of getenv() may be statically allocated, and can be modified by a subsequent call to getenv(), putenv(3), setenv(3), or unsetenv(3). Since strings returned by getenv() are allowed to change on subsequent calls to getenv(), make sure to duplicate when caching external_diff_cmd from environment. This problem becomes apparent on Git for Windows since fe21c6b (mingw: reencode environment variables on the fly (UTF-16 <-> UTF-8)), when the getenv() implementation provided in compat/mingw.c was changed to keep a certain amount of alloc'ed strings and freeing them on subsequent calls. This fixes #2007: $ yes n | git -c difftool.prompt=yes difftool fe21c6b fe21c6b~100 Viewing (1/404): '.gitignore' Launch 'bc3' [Y/n]? Viewing (2/404): 'Documentation/.gitignore' Launch 'bc3' [Y/n]? Viewing (3/404): 'Documentation/Makefile' Launch 'bc3' [Y/n]? Viewing (4/404): 'Documentation/RelNotes/2.14.5.txt' Launch 'bc3' [Y/n]? Viewing (5/404): 'Documentation/RelNotes/2.15.3.txt' Launch 'bc3' [Y/n]? Viewing (6/404): 'Documentation/RelNotes/2.16.5.txt' Launch 'bc3' [Y/n]? Viewing (7/404): 'Documentation/RelNotes/2.17.2.txt' Launch 'bc3' [Y/n]? Viewing (8/404): 'Documentation/RelNotes/2.18.1.txt' Launch 'bc3' [Y/n]? Viewing (9/404): 'Documentation/RelNotes/2.19.0.txt' Launch 'bc3' [Y/n]? error: cannot spawn ¦?: No such file or directory fatal: external diff died, stopping at Documentation/RelNotes/2.19.1.txt Signed-off-by: Kim Gybels <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0d0ac38 commit 6776a84

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

diff.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ static const char *external_diff(void)
489489

490490
if (done_preparing)
491491
return external_diff_cmd;
492-
external_diff_cmd = getenv("GIT_EXTERNAL_DIFF");
492+
external_diff_cmd = xstrdup_or_null(getenv("GIT_EXTERNAL_DIFF"));
493493
if (!external_diff_cmd)
494494
external_diff_cmd = external_diff_cmd_cfg;
495495
done_preparing = 1;

0 commit comments

Comments
 (0)