patch 7.4.1507

Problem:    Crash when starting a job fails.
Solution:   Check for the channel to be NULL.  (idea by Yasuhiro Matsumoto)

diff --git a/src/eval.c b/src/eval.c
index 77638d561288d6c8952619162108c92f7331fc7c..f65c9a0b1bd03005d071a434f5a3d981778948b0 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -15262,7 +15262,8 @@ f_job_start(typval_T *argvars UNUSED, typval_T *rettv)
 
 #ifdef FEAT_CHANNEL
     /* If the channel is reading from a buffer, write lines now. */
-    channel_write_in(job->jv_channel);
+    if (job->jv_channel != NULL)
+       channel_write_in(job->jv_channel);
 #endif
 
 theend:

diff --git a/src/version.c b/src/version.c
index 7e86ba6a391bcadd618cc6a873ed8360ae847d7a..40690ec805845956f5c774905389e9e132310118 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1507,
 /**/
     1506,
 /**/