changeset 8783:23b7f05a7f48 v7.4.1680

commit https://github.com/vim/vim/commit/925ccfde79bf734bc89269c705cebe2d49fe6444 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Mar 28 22:38:02 2016 +0200 patch 7.4.1680 Problem: Coverity warns for not checking name length (false positive). Solution: Only copy the characters we know are there.
author Christian Brabandt <cb@256bit.org>
date Mon, 28 Mar 2016 22:45:08 +0200
parents 6c99467edf7d
children 26512223f779
files src/channel.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);
 
--- 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 */
 /**/
+    1680,
+/**/
     1679,
 /**/
     1678,