diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2014-11-27 21:00:38 -0500 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2014-11-27 21:00:38 -0500 |
commit | 5e4809f5a4ba4d3cc6a6cdea5f7ac632c73086ab (patch) | |
tree | 56977ec3f0ecec660dab19e1ce63778b9259165f /src | |
parent | 49b65b0fcd360f483d93d3b1ed70610bcffd95c4 (diff) | |
parent | 927c6a148d3721bb04ccbe54346b08ec00528e60 (diff) | |
download | rneovim-5e4809f5a4ba4d3cc6a6cdea5f7ac632c73086ab.tar.gz rneovim-5e4809f5a4ba4d3cc6a6cdea5f7ac632c73086ab.tar.bz2 rneovim-5e4809f5a4ba4d3cc6a6cdea5f7ac632c73086ab.zip |
Merge pull request #1566 from splinterofchaos/fix-save-tv-as-string
eval: Fix coverity false positive.
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/eval.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 34990a62e0..8be25bc34e 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -10631,10 +10631,10 @@ static void f_jobsend(typval_T *argvars, typval_T *rettv) ssize_t input_len; char *input = (char *) save_tv_as_string(&argvars[1], &input_len, true); - if (input_len < 0) { - return; // Error handled by save_tv_as_string(). - } else if (input_len == 0) { - return; // Not an error, but nothing to do. + if (!input) { + // Either the error has been handled by save_tv_as_string(), or there is no + // input to send. + return; } WBuffer *buf = wstream_new_buffer(input, input_len, 1, free); @@ -14559,7 +14559,8 @@ static void get_system_output_as_rettv(typval_T *argvars, typval_T *rettv, // get input to the shell command (if any), and its length ssize_t input_len; char *input = (char *) save_tv_as_string(&argvars[1], &input_len, false); - if (input_len == -1) { + if (input_len < 0) { + assert(input == NULL); return; } |