[vim] 35/139: 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)

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit 0239acb11fe4bfe9b525ea90b782759da5eb7704
Author: Bram Moolenaar <Bram at vim.org>
Date:   Mon Apr 11 21:02:54 2016 +0200

    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)
---
 src/eval.c    | 2 ++
 src/version.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/eval.c b/src/eval.c
index 1c5a316..0c270b9 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 ef777cf..4f8bc2e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1722,
+/**/
     1721,
 /**/
     1720,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git