aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-02-23 14:51:41 -0500
committerJustin M. Keyes <justinkz@gmail.com>2016-02-23 14:51:41 -0500
commit18605d678517ca7347a8fae234e5f39f79fb6904 (patch)
tree8cb063c0679ddd38ccebb384bf60321f88248784 /src
parentb25dfecb18b125d2ddc3e231381bd568bb5067de (diff)
parent7feef42e8a5324b3a01e6ce3442b795d5f680b04 (diff)
downloadrneovim-18605d678517ca7347a8fae234e5f39f79fb6904.tar.gz
rneovim-18605d678517ca7347a8fae234e5f39f79fb6904.tar.bz2
rneovim-18605d678517ca7347a8fae234e5f39f79fb6904.zip
Merge pull request #4327 from ffleming/coverity-71530
coverity/71530: Prefer STRLCPY to STRCPY in option.c
Diffstat (limited to 'src')
-rw-r--r--src/nvim/option.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 0f6874e941..af7b272467 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -5947,13 +5947,17 @@ option_value2string (
if (opp->flags & P_NUM) {
long wc = 0;
- if (wc_use_keyname(varp, &wc))
- STRCPY(NameBuff, get_special_key_name((int)wc, 0));
- else if (wc != 0)
- STRCPY(NameBuff, transchar((int)wc));
- else
- sprintf((char *)NameBuff, "%" PRId64, (int64_t)*(long *)varp);
- } else { /* P_STRING */
+ if (wc_use_keyname(varp, &wc)) {
+ STRLCPY(NameBuff, get_special_key_name((int)wc, 0), sizeof(NameBuff));
+ } else if (wc != 0) {
+ STRLCPY(NameBuff, transchar((int)wc), sizeof(NameBuff));
+ } else {
+ snprintf((char *)NameBuff,
+ sizeof(NameBuff),
+ "%" PRId64,
+ (int64_t)*(long *)varp);
+ }
+ } else { // P_STRING
varp = *(char_u **)(varp);
if (varp == NULL) /* just in case */
NameBuff[0] = NUL;