patch 7.4.1665

Problem:    Crash when calling job_start() with a NULL string. (Dominique)
Solution:   Check for an invalid argument.

diff --git a/src/channel.c b/src/channel.c
index 22f63b3a83580365b21c582e086970116bcb8052..ccab2cb447e61c9d6afd6f27ffe41a475da58975 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -3812,6 +3812,11 @@ job_start(typval_T *argvars)
     {
        /* Command is a string. */
        cmd = argvars[0].vval.v_string;
+       if (cmd == NULL || *cmd == NUL)
+       {
+           EMSG(_(e_invarg));
+           return job;
+       }
 #ifdef USE_ARGV
        if (mch_parse_cmd(cmd, FALSE, &argv, &argc) == FAIL)
            return job;

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 94311e9a69d8c376a11c937485b89d29083949e2..8356ba7a5cd2e9f4a86b2761c21fd84d97a591f1 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1201,5 +1201,10 @@ func Test_close_callback()
   call s:run_server('s:test_close_callback')
 endfunc
 
+func Test_job_start_invalid()
+  call assert_fails('call job_start($x)', 'E474:')
+  call assert_fails('call job_start("")', 'E474:')
+endfunc
+
 " Uncomment this to see what happens, output is in src/testdir/channellog.
 " call ch_logfile('channellog', 'w')

diff --git a/src/version.c b/src/version.c
index e925e413a9ca6f9c98e1edd39e1c8919931354df..e183717f4db63190da872aa79c66d072529386b4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1665,
 /**/
     1664,
 /**/