thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2944: Vim9: no error when using job or channel as a string

Browse Source 
Problem:    Vim9: no error when using job or channel as a string.
Solution:   Be more strict about conversion to string. (closes #8312)
This commit is contained in:
Bram Moolenaar
2021-06-05 20:51:38 +02:00
parent c6d71532dd
commit 1328bde9d4
9 changed files with 76 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/channel.c
View File

@@ -5015,4 +5015,22 @@ f_ch_status(typval_T *argvars, typval_T *rettv)
rettv->vval.v_string = vim_strsave((char_u *)channel_status(channel, part));
}
/*
* Get a string with information about the channel in "varp" in "buf".
* "buf" must be at least NUMBUFLEN long.
*/
char_u *
channel_to_string_buf(typval_T *varp, char_u *buf)
{
channel_T *channel = varp->vval.v_channel;
char *status = channel_status(channel, -1);
if (channel == NULL)
vim_snprintf((char *)buf, NUMBUFLEN, "channel %s", status);
else
vim_snprintf((char *)buf, NUMBUFLEN,
"channel %d %s", channel->ch_id, status);
return buf;
}
#endif // FEAT_JOB_CHANNEL

3
src/eval.c
View File

@@ -5060,7 +5060,8 @@ echo_string_core(
case VAR_JOB:
case VAR_CHANNEL:
*tofree = NULL;
r = tv_get_string_buf(tv, numbuf);
r = tv->v_type == VAR_JOB ? job_to_string_buf(tv, numbuf)
: channel_to_string_buf(tv, numbuf);
if (composite_val)
{
*tofree = string_quote(r, FALSE);

30
src/job.c
View File

@@ -1927,4 +1927,34 @@ f_job_stop(typval_T *argvars, typval_T *rettv)
rettv->vval.v_number = job_stop(job, argvars, NULL);
}
/*
* Get a string with information about the job in "varp" in "buf".
* "buf" must be at least NUMBUFLEN long.
*/
char_u *
job_to_string_buf(typval_T *varp, char_u *buf)
{
job_T *job = varp->vval.v_job;
char *status;
if (job == NULL)
return (char_u *)"no process";
status = job->jv_status == JOB_FAILED ? "fail"
: job->jv_status >= JOB_ENDED ? "dead"
: "run";
# ifdef UNIX
vim_snprintf((char *)buf, NUMBUFLEN,
"process %ld %s", (long)job->jv_pid, status);
# elif defined(MSWIN)
vim_snprintf((char *)buf, NUMBUFLEN,
"process %ld %s",
(long)job->jv_proc_info.dwProcessId,
status);
# else
// fall-back
vim_snprintf((char *)buf, NUMBUFLEN, "process ? %s", status);
# endif
return buf;
}
#endif // FEAT_JOB_CHANNEL

1
src/proto/channel.pro
View File

@@ -58,4 +58,5 @@ void f_ch_evalraw(typval_T *argvars, typval_T *rettv);
void f_ch_sendraw(typval_T *argvars, typval_T *rettv);
void f_ch_setoptions(typval_T *argvars, typval_T *rettv);
void f_ch_status(typval_T *argvars, typval_T *rettv);
char_u *channel_to_string_buf(typval_T *varp, char_u *buf);
/* vim: set ft=c : */

1
src/proto/job.pro
View File

@@ -34,4 +34,5 @@ void f_job_setoptions(typval_T *argvars, typval_T *rettv);
void f_job_start(typval_T *argvars, typval_T *rettv);
void f_job_status(typval_T *argvars, typval_T *rettv);
void f_job_stop(typval_T *argvars, typval_T *rettv);
char_u *job_to_string_buf(typval_T *varp, char_u *buf);
/* vim: set ft=c : */

12
src/testdir/test_vim9_builtin.vim
View File

@@ -1104,7 +1104,7 @@ def Test_set_get_bufline()
assert_equal([], getbufline(b, 2, 1))
if has('job')
setbufline(b, 2, [function('eval'), {key: 123}, test_null_job()])
setbufline(b, 2, [function('eval'), {key: 123}, string(test_null_job())])
assert_equal(["function('eval')",
"{'key': 123}",
"no process"],
@@ -1250,6 +1250,16 @@ def Test_submatch()
actual->assert_equal(expected)
enddef
def Test_substitute()
var res = substitute('A1234', '\d', 'X', '')
assert_equal('AX234', res)
if has('job')
assert_fails('"text"->substitute(".*", () => job_start(":"), "")', 'E908: using an invalid value as a String: job')
assert_fails('"text"->substitute(".*", () => job_start(":")->job_getchannel(), "")', 'E908: using an invalid value as a String: channel')
endif
enddef
def Test_synID()
new
setline(1, "text")

40
src/typval.c
View File

@@ -414,7 +414,7 @@ tv_get_string_strict(typval_T *varp)
char_u *
tv_get_string_buf(typval_T *varp, char_u *buf)
{
char_u *res = tv_get_string_buf_chk(varp, buf);
char_u *res = tv_get_string_buf_chk(varp, buf);
return res != NULL ? res : (char_u *)"";
}
@@ -478,44 +478,22 @@ tv_get_string_buf_chk_strict(typval_T *varp, char_u *buf, int strict)
break;
case VAR_JOB:
#ifdef FEAT_JOB_CHANNEL
if (in_vim9script())
{
job_T *job = varp->vval.v_job;
char *status;
if (job == NULL)
return (char_u *)"no process";
status = job->jv_status == JOB_FAILED ? "fail"
: job->jv_status >= JOB_ENDED ? "dead"
: "run";
# ifdef UNIX
vim_snprintf((char *)buf, NUMBUFLEN,
"process %ld %s", (long)job->jv_pid, status);
# elif defined(MSWIN)
vim_snprintf((char *)buf, NUMBUFLEN,
"process %ld %s",
(long)job->jv_proc_info.dwProcessId,
status);
# else
// fall-back
vim_snprintf((char *)buf, NUMBUFLEN, "process ? %s", status);
# endif
return buf;
semsg(_(e_using_invalid_value_as_string_str), "job");
break;
}
return job_to_string_buf(varp, buf);
#endif
break;
case VAR_CHANNEL:
#ifdef FEAT_JOB_CHANNEL
if (in_vim9script())
{
channel_T *channel = varp->vval.v_channel;
char *status = channel_status(channel, -1);
if (channel == NULL)
vim_snprintf((char *)buf, NUMBUFLEN, "channel %s", status);
else
vim_snprintf((char *)buf, NUMBUFLEN,
"channel %d %s", channel->ch_id, status);
return buf;
semsg(_(e_using_invalid_value_as_string_str), "channel");
break;
}
return channel_to_string_buf(varp, buf);
#endif
break;
case VAR_UNKNOWN:

2
src/version.c
View File

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

3
src/vim9execute.c
View File

@@ -4831,10 +4831,11 @@ list_instructions(char *pfx, isn_T *instr, int instr_count, ufunc_T *ufunc)
{
typval_T tv;
char_u *name;
char_u buf[NUMBUFLEN];
tv.v_type = VAR_JOB;
tv.vval.v_job = iptr->isn_arg.job;
name = tv_get_string(&tv);
name = job_to_string_buf(&tv, buf);
smsg("%s%4d PUSHJOB \"%s\"", pfx, current, name);
}
#endif