forked from aniani/vim
patch 7.4.1503
Problem: Crash when using ch_getjob(). (Damien) Solution: Check for a NULL job.
This commit is contained in:
@@ -15249,6 +15249,7 @@ f_job_start(typval_T *argvars UNUSED, typval_T *rettv)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef FEAT_CHANNEL
|
#ifdef FEAT_CHANNEL
|
||||||
|
/* If the channel is reading from a buffer, write lines now. */
|
||||||
channel_write_in(job->jv_channel);
|
channel_write_in(job->jv_channel);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -22601,7 +22602,11 @@ get_tv_string_buf_chk(typval_T *varp, char_u *buf)
|
|||||||
#ifdef FEAT_JOB
|
#ifdef FEAT_JOB
|
||||||
{
|
{
|
||||||
job_T *job = varp->vval.v_job;
|
job_T *job = varp->vval.v_job;
|
||||||
char *status = job->jv_status == JOB_FAILED ? "fail"
|
char *status;
|
||||||
|
|
||||||
|
if (job == NULL)
|
||||||
|
return (char_u *)"no process";
|
||||||
|
status = job->jv_status == JOB_FAILED ? "fail"
|
||||||
: job->jv_status == JOB_ENDED ? "dead"
|
: job->jv_status == JOB_ENDED ? "dead"
|
||||||
: "run";
|
: "run";
|
||||||
# ifdef UNIX
|
# ifdef UNIX
|
||||||
|
@@ -108,6 +108,10 @@ func s:communicate(port)
|
|||||||
call assert_false(1, "Can't open channel")
|
call assert_false(1, "Can't open channel")
|
||||||
return
|
return
|
||||||
endif
|
endif
|
||||||
|
if has('job')
|
||||||
|
" check that no job is handled correctly
|
||||||
|
call assert_equal('no process', string(ch_getjob(handle)))
|
||||||
|
endif
|
||||||
|
|
||||||
" Simple string request and reply.
|
" Simple string request and reply.
|
||||||
call assert_equal('got it', ch_evalexpr(handle, 'hello!'))
|
call assert_equal('got it', ch_evalexpr(handle, 'hello!'))
|
||||||
|
@@ -743,6 +743,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 */
|
||||||
|
/**/
|
||||||
|
1503,
|
||||||
/**/
|
/**/
|
||||||
1502,
|
1502,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user