aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-16 23:24:03 -05:00
Code Activity

patch 8.0.1671: crash when passing non-dict argument as env to job_start()

Browse Source 
Problem:    Crash when passing non-dict argument as env to job_start().
Solution:   Check for valid argument. (Ozaki Kiichi, closes #2765)
This commit is contained in:
Bram Moolenaar
2018-04-07 13:22:21 +02:00
parent b6ed74fef8
commit 22efba47de
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/channel.c
View File

@@ -4797,9 +4797,15 @@ get_job_options(typval_T *tv, jobopt_T *opt, int supported, int supported2)
{ {
if (!(supported2 & JO2_ENV)) if (!(supported2 & JO2_ENV))
break; break;
if (item->v_type != VAR_DICT)
{
EMSG2(_(e_invargval), "env");
return FAIL;
}
opt->jo_set2 |= JO2_ENV; opt->jo_set2 |= JO2_ENV;
opt->jo_env = item->vval.v_dict; opt->jo_env = item->vval.v_dict;
++item->vval.v_dict->dv_refcount; if (opt->jo_env != NULL)
++opt->jo_env->dv_refcount;
} }
else if (STRCMP(hi->hi_key, "cwd") == 0) else if (STRCMP(hi->hi_key, "cwd") == 0)
{ {

11
src/testdir/test_channel.vim
View File

@@ -1720,10 +1720,12 @@ func Test_env()
let g:envstr = '' let g:envstr = ''
if has('win32') if has('win32')
call job_start(['cmd', '/c', 'echo %FOO%'], {'callback': {ch,msg->execute(":let g:envstr .= msg")}, 'env':{'FOO': 'bar'}}) let cmd = ['cmd', '/c', 'echo %FOO%']
else else
call job_start([&shell, &shellcmdflag, 'echo $FOO'], {'callback': {ch,msg->execute(":let g:envstr .= msg")}, 'env':{'FOO': 'bar'}}) let cmd = [&shell, &shellcmdflag, 'echo $FOO']
endif endif
call assert_fails('call job_start(cmd, {"env": 1})', 'E475:')
call job_start(cmd, {'callback': {ch,msg -> execute(":let g:envstr .= msg")}, 'env': {'FOO': 'bar'}})
call WaitFor('"" != g:envstr') call WaitFor('"" != g:envstr')
call assert_equal("bar", g:envstr) call assert_equal("bar", g:envstr)
unlet g:envstr unlet g:envstr
@@ -1737,11 +1739,12 @@ func Test_cwd()
let g:envstr = '' let g:envstr = ''
if has('win32') if has('win32')
let expect = $TEMP let expect = $TEMP
let job = job_start(['cmd', '/c', 'echo %CD%'], {'callback': {ch,msg->execute(":let g:envstr .= msg")}, 'cwd': expect}) let cmd = ['cmd', '/c', 'echo %CD%']
else else
let expect = $HOME let expect = $HOME
let job = job_start(['pwd'], {'callback': {ch,msg->execute(":let g:envstr .= msg")}, 'cwd': expect}) let cmd = ['pwd']
endif endif
let job = job_start(cmd, {'callback': {ch,msg -> execute(":let g:envstr .= msg")}, 'cwd': expect})
try try
call WaitFor('"" != g:envstr') call WaitFor('"" != g:envstr')
let expect = substitute(expect, '[/\\]$', '', '') let expect = substitute(expect, '[/\\]$', '', '')

2
src/version.c
View File

@@ -762,6 +762,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 */
/**/
1671,
/**/ /**/
1670, 1670,
/**/ /**/