From: Bram Moolenaar Date: Mon, 28 Mar 2016 20:38:02 +0000 (+0200) Subject: patch 7.4.1680 X-Git-Tag: v7.4.1680 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=925ccfde79bf734bc89269c705cebe2d49fe6444;p=vim 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 ba9f9c736..98bc6be63 100644 --- 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 e1f7a2add..4778bfecd 100644 --- 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, /**/