IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

coverity/161216: Ensure buf is valid for lifetime of defstr

Browse Source 
Depending on the type of argument for input()/inputdialog()'s {text}
argument, defstr may point to buf.  Therefore it needs to be in scope
for the lifetime of defstr.

Also, use a different buffer for the handling of the 3rd argument to
input()/inputdialog().  Although the buffer defstr points to is used
immediately, it avoids potential mishaps if the code changes.
This commit is contained in:
James McCoy 2017-03-30 22:11:40 -04:00
parent 1222c82799
commit 338da727cd
No known key found for this signature in database
GPG Key ID: DFE691AE331BA3DB
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/eval.c
View File

@ -11008,18 +11008,19 @@ static void get_user_input(typval_T *argvars, typval_T *rettv, int inputdialog)
cmdline_row = msg_row;
const char *defstr = "";
char buf[NUMBUFLEN];
if (argvars[1].v_type != VAR_UNKNOWN) {
char buf[NUMBUFLEN];
defstr = tv_get_string_buf_chk(&argvars[1], buf);
if (defstr != NULL) {
stuffReadbuffSpec(defstr);
}
if (!inputdialog && argvars[2].v_type != VAR_UNKNOWN) {
char buf2[NUMBUFLEN];
// input() with a third argument: completion
rettv->vval.v_string = NULL;
const char *const xp_name = tv_get_string_buf_chk(&argvars[2], buf);
const char *const xp_name = tv_get_string_buf_chk(&argvars[2], buf2);
if (xp_name == NULL) {
return;
}