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 7af19b0..c79107c 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -5189,6 +5189,11 @@
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 156168f..bbc74c7 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5475,7 +5475,9 @@
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 aafd7e8..7d807ac 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -203,6 +203,9 @@
}
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 @@
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 @@
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 b0058e4..a062258 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 746,
+/**/
745,
/**/
744,