# HG changeset patch # User Bram Moolenaar # Date 1569924903 -7200 # Node ID d27060eba45ff98c78a44c33e4ca09bbb4c80c8c # Parent 8b45fb2c75d97a5797173d7308bcb79a9f325d5c patch 8.1.2105: MS-Windows: system() may crash Commit: https://github.com/vim/vim/commit/2886dccebaec2da55e5a99bd88d44ae4217dee6e Author: Bram Moolenaar Date: Tue Oct 1 12:10:25 2019 +0200 patch 8.1.2105: MS-Windows: system() may crash Problem: MS-Windows: system() may crash. Solution: Do not use "itmp" when it is NULL. (Yasuhiro Matsumoto, closes #5005) diff --git a/src/ex_cmds.c b/src/ex_cmds.c --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -1778,28 +1778,30 @@ make_filter_cmd( } else { - char_u *p; - - /* - * If there is a pipe, we have to put the '<' in front of it. - * Don't do this when 'shellquote' is not empty, otherwise the - * redirection would be inside the quotes. - */ - if (*p_shq == NUL) + STRCPY(buf, cmd); + if (itmp != NULL) { - p = find_pipe(buf); - if (p != NULL) - *p = NUL; - } - STRCAT(buf, " <"); /* " < " causes problems on Amiga */ - STRCAT(buf, itmp); - if (*p_shq == NUL) - { - p = find_pipe(cmd); - if (p != NULL) + char_u *p; + + // If there is a pipe, we have to put the '<' in front of it. + // Don't do this when 'shellquote' is not empty, otherwise the + // redirection would be inside the quotes. + if (*p_shq == NUL) { - STRCAT(buf, " "); /* insert a space before the '|' for DOS */ - STRCAT(buf, p); + p = find_pipe(buf); + if (p != NULL) + *p = NUL; + } + STRCAT(buf, " <"); // " < " causes problems on Amiga + STRCAT(buf, itmp); + if (*p_shq == NUL) + { + p = find_pipe(cmd); + if (p != NULL) + { + STRCAT(buf, " "); // insert a space before the '|' for DOS + STRCAT(buf, p); + } } } } diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2105, +/**/ 2104, /**/ 2103,