diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-28 22:38:02 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-28 22:38:02 +0200 |
| commit | 925ccfde79bf734bc89269c705cebe2d49fe6444 (patch) | |
| tree | 48479bf32def78de79cf6d178e0f7ceaf15d6f95 /src | |
| parent | 7d2a5796d39905a972e8f74af5f7b0a62e3de173 (diff) | |
| download | vim-git-925ccfde79bf734bc89269c705cebe2d49fe6444.tar.gz | |
patch 7.4.1680v7.4.1680
Problem: Coverity warns for not checking name length (false positive).
Solution: Only copy the characters we know are there.
Diffstat (limited to 'src')
| -rw-r--r-- | src/channel.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
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 @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1680, +/**/ 1679, /**/ 1678, |