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 1c5a31658bdd3801116fcdc8e05213069d73da70..0c270b928d4c68476939be063488e9a8d071a3f4 100644 (file)
--- 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 ef777cf1643da681bdd1176d7e5f4cf948b275f8..4f8bc2ef5bd2f07cfb3fb450aabd575409085175 100644 (file)
--- 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,
 /**/