# HG changeset patch # User Bram Moolenaar # Date 1577027704 -3600 # Node ID 70d6614aaf2895e109a7e9262b127087b2dbc486 # Parent 9af4bf3b4f8261721163ef953e5f69b17d29bd05 patch 8.2.0031: MS-Windows: test for empty job fails Commit: https://github.com/vim/vim/commit/ba0a7475c52ea0ba9e083934bd328fbcbfa8d532 Author: Bram Moolenaar Date: Sun Dec 22 16:09:06 2019 +0100 patch 8.2.0031: MS-Windows: test for empty job fails Problem: MS-Windows: test for empty job fails Solution: Check for error message, make it also fail on Unix. diff --git a/src/channel.c b/src/channel.c --- a/src/channel.c +++ b/src/channel.c @@ -5943,11 +5943,19 @@ job_start( if (build_argv_from_list(l, &argv, &argc) == FAIL) goto theend; -#ifndef USE_ARGV + + // Empty command is invalid. +#ifdef USE_ARGV + if (argc == 0 || *skipwhite((char_u *)argv[0]) == NUL) + { + emsg(_(e_invarg)); + goto theend; + } +#else if (win32_build_cmd(l, &ga) == FAIL) goto theend; cmd = ga.ga_data; - if (cmd == NULL) + if (cmd == NULL || *skipwhite(cmd) == NUL) { emsg(_(e_invarg)); goto theend; diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -1960,8 +1960,8 @@ endfunc func Test_empty_job() " This was crashing on MS-Windows. - let job = job_start([""]) - call WaitForAssert({-> assert_equal("dead", job_status(job))}) + call assert_fails('let job = job_start([""])', 'E474:') + call assert_fails('let job = job_start([" "])', 'E474:') endfunc " Do this last, it stops any channel log. diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 31, +/**/ 30, /**/ 29,