patch 7.4.1680

Problem:    Coverity warns for not checking name length (false positive).
Solution:   Only copy the characters we know are there.

diff --git a/src/channel.c b/src/channel.c
index ba9f9c736c6575d55bbc49be20d009143c5dff9f..98bc6be63b0f653d78312ba17545f060f6e57e7a 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -2284,11 +2284,11 @@ channel_status(channel_T *channel)
 channel_part_info(channel_T *channel, dict_T *dict, char *name, int part)
 {
     chanpart_T *chanpart = &channel->ch_part[part];
-    char       namebuf[20];
+    char       namebuf[20];  /* longest is "sock_timeout" */
     size_t     tail;
     char       *s = "";
 
-    STRCPY(namebuf, name);
+    vim_strncpy((char_u *)namebuf, (char_u *)name, 4);
     STRCAT(namebuf, "_");
     tail = STRLEN(namebuf);
 

diff --git a/src/version.c b/src/version.c
index e1f7a2addad714664b387f8e2b20a9b136fc0746..4778bfecdc65f679249b6f44c67cb7e187998305 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 */
+/**/
+    1680,
 /**/
     1679,
 /**/