aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

patch 8.1.2105: MS-Windows: system() may crash

Browse Source 
Problem:    MS-Windows: system() may crash.
Solution:   Do not use "itmp" when it is NULL. (Yasuhiro Matsumoto,
            closes #5005)
This commit is contained in:
Bram Moolenaar 2019-10-01 12:10:25 +02:00
parent 792cf5e1be
commit 2886dcceba
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/ex_cmds.c
View File

@ -1778,28 +1778,30 @@ make_filter_cmd(
} }
else else
{ {
char_u *p; STRCPY(buf, cmd);
if (itmp != NULL)
{
char_u *p;
/* // If there is a pipe, we have to put the '<' in front of it.
* 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
* Don't do this when 'shellquote' is not empty, otherwise the // redirection would be inside the quotes.
* redirection would be inside the quotes. if (*p_shq == NUL)
*/
if (*p_shq == NUL)
{
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 */ p = find_pipe(buf);
STRCAT(buf, p); 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);
}
} }
} }
} }

2
src/version.c
View File

@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2105,
/**/ /**/
2104, 2104,
/**/ /**/