patch 7.4.1593

Problem:    Using channel timeout instead of request timeout. (Coverity)
Solution:   Remove the extra assignment.

diff --git a/src/channel.c b/src/channel.c
index 1f7ad6174e515bf7e9c1b0368969ab6c57abd834..2a71077fd311a213e39d420812ebfdb3f51ad7d5 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -2684,7 +2684,6 @@ ch_expr_common(typval_T *argvars, typval_T *rettv, int eval)
            timeout = opt.jo_timeout;
        else
            timeout = channel_get_timeout(channel, part_read);
-       timeout = channel_get_timeout(channel, part_read);
        if (channel_read_json_block(channel, part_read, timeout, id, &listtv)
                                                                        == OK)
        {

diff --git a/src/version.c b/src/version.c
index 409a9f40ba7e43680a49238b2d238934d2f8347b..449c8f24ef541dbc81cafd85a3531d39f5436910 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 */
+/**/
+    1593,
 /**/
     1592,
 /**/