patch 8.0.0746: when :term fails the job is not properly cleaned up

Problem:    When :term fails the job is not properly cleaned up.
Solution:   Free the terminal. Handle a job that failed to start. (closes
            #1858)

diff --git a/src/channel.c b/src/channel.c
index 7af19b0412eac758b3d7a0bc0d17f4d34a521d0c..c79107c8694fc39a1c12aec0b42f0f2f1f3deb35 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -5189,6 +5189,11 @@ job_stop(job_T *job, typval_T *argvars, char *type)
            return 0;
        }
     }
+    if (job->jv_status == JOB_FAILED)
+    {
+       ch_log(job->jv_channel, "Job failed to start, job_stop() skipped");
+       return 0;
+    }
     if (job->jv_status == JOB_ENDED)
     {
        ch_log(job->jv_channel, "Job has already ended, job_stop() skipped");

diff --git a/src/os_unix.c b/src/os_unix.c
index 156168fcc369854f59a5e5943d17ad962975f5e0..bbc74c7f709604a78367913f2bda6ca3fd2b5054 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5475,7 +5475,9 @@ mch_stop_job(job_T *job, char_u *how)
        job_pid = -job_pid;
 #endif
 
-    kill(job_pid, sig);
+    /* Never kill ourselves! */
+    if (job_pid != 0)
+       kill(job_pid, sig);
 
     return OK;
 }

diff --git a/src/terminal.c b/src/terminal.c
index aafd7e89fa4a810844f9dfebc148030f500ac12b..7d807acbcb1049b25246a1387477ab72d7db3219 100644 (file)
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -203,6 +203,9 @@ ex_terminal(exarg_T *eap)
     }
     else
     {
+       free_terminal(term);
+       curbuf->b_term = NULL;
+
        /* Wiping out the buffer will also close the window and call
         * free_terminal(). */
        do_buffer(DOBUF_WIPE, DOBUF_CURRENT, FORWARD, 0, TRUE);
@@ -235,7 +238,8 @@ free_terminal(term_T *term)
 
     if (term->tl_job != NULL)
     {
-       if (term->tl_job->jv_status != JOB_ENDED)
+       if (term->tl_job->jv_status != JOB_ENDED
+                                     && term->tl_job->jv_status != JOB_FAILED)
            job_stop(term->tl_job, NULL, "kill");
        job_unref(term->tl_job);
     }
@@ -941,7 +945,9 @@ term_and_job_init(term_T *term, int rows, int cols, char_u *cmd)
     setup_job_options(&opt, rows, cols);
     term->tl_job = job_start(argvars, &opt);
 
-    return term->tl_job != NULL ? OK : FAIL;
+    return term->tl_job != NULL
+       && term->tl_job->jv_channel != NULL
+       && term->tl_job->jv_status != JOB_FAILED ? OK : FAIL;
 }
 
 /*

diff --git a/src/version.c b/src/version.c
index b0058e4d3e800fb700df00fae158e0fbc4adbe61..a0622588a11132e2507d8c92ba911eb9189f176e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    746,
 /**/
     745,
 /**/