Skip to content

Commit 22efba4

Browse files
committed
patch 8.0.1671: crash when passing non-dict argument as env to job_start()
Problem: Crash when passing non-dict argument as env to job_start(). Solution: Check for valid argument. (Ozaki Kiichi, closes #2765)
1 parent b6ed74f commit 22efba4

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

src/channel.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4797,9 +4797,15 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
47974797
{
47984798
if (!(supported2 & JO2_ENV))
47994799
break;
4800+
if (item->v_type != VAR_DICT)
4801+
{
4802+
EMSG2(_(e_invargval), "env");
4803+
return FAIL;
4804+
}
48004805
opt->jo_set2 |= JO2_ENV;
48014806
opt->jo_env = item->vval.v_dict;
4802-
++item->vval.v_dict->dv_refcount;
4807+
if (opt->jo_env != NULL)
4808+
++opt->jo_env->dv_refcount;
48034809
}
48044810
else if (STRCMP(hi->hi_key, "cwd") == 0)
48054811
{

src/testdir/test_channel.vim

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1720,10 +1720,12 @@ func Test_env()
17201720

17211721
let g:envstr = ''
17221722
if has('win32')
1723-
call job_start(['cmd', '/c', 'echo %FOO%'], {'callback': {ch,msg->execute(":let g:envstr .= msg")}, 'env':{'FOO': 'bar'}})
1723+
let cmd = ['cmd', '/c', 'echo %FOO%']
17241724
else
1725-
call job_start([&shell, &shellcmdflag, 'echo $FOO'], {'callback': {ch,msg->execute(":let g:envstr .= msg")}, 'env':{'FOO': 'bar'}})
1725+
let cmd = [&shell, &shellcmdflag, 'echo $FOO']
17261726
endif
1727+
call assert_fails('call job_start(cmd, {"env": 1})', 'E475:')
1728+
call job_start(cmd, {'callback': {ch,msg -> execute(":let g:envstr .= msg")}, 'env': {'FOO': 'bar'}})
17271729
call WaitFor('"" != g:envstr')
17281730
call assert_equal("bar", g:envstr)
17291731
unlet g:envstr
@@ -1737,11 +1739,12 @@ func Test_cwd()
17371739
let g:envstr = ''
17381740
if has('win32')
17391741
let expect = $TEMP
1740-
let job = job_start(['cmd', '/c', 'echo %CD%'], {'callback': {ch,msg->execute(":let g:envstr .= msg")}, 'cwd': expect})
1742+
let cmd = ['cmd', '/c', 'echo %CD%']
17411743
else
17421744
let expect = $HOME
1743-
let job = job_start(['pwd'], {'callback': {ch,msg->execute(":let g:envstr .= msg")}, 'cwd': expect})
1745+
let cmd = ['pwd']
17441746
endif
1747+
let job = job_start(cmd, {'callback': {ch,msg -> execute(":let g:envstr .= msg")}, 'cwd': expect})
17451748
try
17461749
call WaitFor('"" != g:envstr')
17471750
let expect = substitute(expect, '[/\\]$', '', '')

src/version.c

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

763763
static int included_patches[] =
764764
{ /* Add new patch number below this line */
765+
/**/
766+
1671,
765767
/**/
766768
1670,
767769
/**/

0 commit comments

Comments
 (0)