From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 11 Apr 2016 19:02:54 +0000 (+0200)
Subject: patch 7.4.1722
X-Git-Tag: v7.4.1722
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0239acb11fe4bfe9b525ea90b782759da5eb7704;p=thirdparty%2Fvim.git

patch 7.4.1722
Problem:    Crash when calling garbagecollect() after starting a job.
Solution:   Set the copyID on job and channel. (Hirohito Higashi, Ozaki
            Kiichi)
---

diff --git a/src/eval.c b/src/eval.c
index 1c5a31658b..0c270b928d 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -7326,6 +7326,7 @@ set_ref_in_item(
 
 	if (job != NULL && job->jv_copyID != copyID)
 	{
+	    job->jv_copyID = copyID;
 	    if (job->jv_channel != NULL)
 	    {
 		dtv.v_type = VAR_CHANNEL;
@@ -7350,6 +7351,7 @@ set_ref_in_item(
 
 	if (ch != NULL && ch->ch_copyID != copyID)
 	{
+	    ch->ch_copyID = copyID;
 	    for (part = PART_SOCK; part <= PART_IN; ++part)
 	    {
 		for (jq = ch->ch_part[part].ch_json_head.jq_next; jq != NULL;
diff --git a/src/version.c b/src/version.c
index ef777cf164..4f8bc2ef5b 100644
--- 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 */
+/**/
+    1722,
 /**/
     1721,
 /**/