mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-18 17:28:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

coverity/161194: Restore check for 'keywordprg' being ":help"

Browse Source 
998d0ffc09 removed the explicit check for
":help", relying instead on whether the user was in a help buffer.
However, this breaks escaping the identifier for use in the lookup
command.

2f54d6927c tried to fix this by removing
"!kp_ex" in "if (cmdchar == 'K' && !kp_ex)", but that causes shell
escaping to be used instead of escaping for tag lookup.
This commit is contained in:
James McCoy
2017-03-29 16:51:46 -04:00
parent 3116f870ba
commit 1c6ae58fd1
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/normal.c
View File

@@ -4670,6 +4670,7 @@ static void nv_ident(cmdarg_T *cap)
char_u *kp = *curbuf->b_p_kp == NUL ? p_kp : curbuf->b_p_kp; // 'keywordprg' char_u *kp = *curbuf->b_p_kp == NUL ? p_kp : curbuf->b_p_kp; // 'keywordprg'
assert(*kp != NUL); // option.c:do_set() should default to ":help" if empty. assert(*kp != NUL); // option.c:do_set() should default to ":help" if empty.
bool kp_ex = (*kp == ':'); // 'keywordprg' is an ex command bool kp_ex = (*kp == ':'); // 'keywordprg' is an ex command
bool kp_help = (STRCMP(kp, ":he") == 0 || STRCMP(kp, ":help") == 0);
size_t buf_size = n * 2 + 30 + STRLEN(kp); size_t buf_size = n * 2 + 30 + STRLEN(kp);
char *buf = xmalloc(buf_size); char *buf = xmalloc(buf_size);
buf[0] = NUL; buf[0] = NUL;
@@ -4692,7 +4693,9 @@ static void nv_ident(cmdarg_T *cap)
break; break;
case 'K': case 'K':
if (kp_ex) { if (kp_help) {
STRCPY(buf, "he! ");
} else if (kp_ex) {
if (cap->count0 != 0) { // Send the count to the ex command. if (cap->count0 != 0) { // Send the count to the ex command.
snprintf(buf, buf_size, "%" PRId64, (int64_t)(cap->count0)); snprintf(buf, buf_size, "%" PRId64, (int64_t)(cap->count0));
} }
@@ -4755,7 +4758,7 @@ static void nv_ident(cmdarg_T *cap)
} }
// Now grab the chars in the identifier // Now grab the chars in the identifier
if (cmdchar == 'K') { if (cmdchar == 'K' && !kp_help) {
ptr = vim_strnsave(ptr, n); ptr = vim_strnsave(ptr, n);
if (kp_ex) { if (kp_ex) {
// Escape the argument properly for an Ex command // Escape the argument properly for an Ex command