Skip to content

Commit 583c1f1

Browse files
committed
patch 7.4.1544
Problem: On Win32 escaping the command does not work properly. Solution: Reset 'ssl' when escaping the command. (Yasuhiro Matsumoto)
1 parent 5a6ec52 commit 583c1f1

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

src/channel.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3625,7 +3625,17 @@ job_start(typval_T *argvars)
36253625
/* Only escape when needed, double quotes are not always allowed. */
36263626
if (li != l->lv_first && vim_strpbrk(s, (char_u *)" \t\"") != NULL)
36273627
{
3628+
# ifdef WIN32
3629+
int old_ssl = p_ssl;
3630+
3631+
/* This is using CreateProcess, not cmd.exe. Always use
3632+
* double quote and backslashes. */
3633+
p_ssl = 0;
3634+
# endif
36283635
s = vim_strsave_shellescape(s, FALSE, TRUE);
3636+
# ifdef WIN32
3637+
p_ssl = old_ssl;
3638+
# endif
36293639
if (s == NULL)
36303640
goto theend;
36313641
ga_concat(&ga, s);

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,8 @@ static char *(features[]) =
743743

744744
static int included_patches[] =
745745
{ /* Add new patch number below this line */
746+
/**/
747+
1544,
746748
/**/
747749
1543,
748750
/**/

0 commit comments

Comments
 (0)