diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-01-15 22:31:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-15 22:31:11 +0100 |
| commit | f09a30d5b0abb8f12d2e6a10cebaf87ca11aa135 (patch) | |
| tree | f56884e9e81b01e5e657035b154cb61496279a73 /src | |
| parent | 900708f93b16d8d78f107e2b9ee16ae20f3e55b1 (diff) | |
| parent | 624ac8aede93cc521d7ea27ae406ad4780642fcb (diff) | |
| download | rneovim-f09a30d5b0abb8f12d2e6a10cebaf87ca11aa135.tar.gz rneovim-f09a30d5b0abb8f12d2e6a10cebaf87ca11aa135.tar.bz2 rneovim-f09a30d5b0abb8f12d2e6a10cebaf87ca11aa135.zip | |
Merge #7839 'coverity fixes'
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 2 | ||||
| -rw-r--r-- | src/nvim/eval/decode.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 2e8bf18f2d..a642a3c0dd 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -11110,6 +11110,7 @@ void get_user_input(const typval_T *const argvars, char defstr_buf[NUMBUFLEN]; char cancelreturn_buf[NUMBUFLEN]; char xp_name_buf[NUMBUFLEN]; + char def[1] = { 0 }; if (argvars[0].v_type == VAR_DICT) { if (argvars[1].v_type != VAR_UNKNOWN) { emsgf(_("E5050: {opts} must be the only argument")); @@ -11124,7 +11125,6 @@ void get_user_input(const typval_T *const argvars, if (defstr == NULL) { return; } - char def[1] = { 0 }; cancelreturn = tv_dict_get_string_buf_chk(dict, S_LEN("cancelreturn"), cancelreturn_buf, def); if (cancelreturn == NULL) { // error diff --git a/src/nvim/eval/decode.c b/src/nvim/eval/decode.c index af4e055d23..cd967ed5c5 100644 --- a/src/nvim/eval/decode.c +++ b/src/nvim/eval/decode.c @@ -285,7 +285,7 @@ typval_T decode_string(const char *const s, const size_t len, .v_type = VAR_STRING, .v_lock = VAR_UNLOCKED, .vval = { .v_string = (char_u *)( - s_allocated ? (char *)s : xmemdupz(s, len)) }, + (s == NULL || s_allocated) ? (char *)s : xmemdupz(s, len)) }, }; } } |