diff options
| author | James McCoy <jamessan@jamessan.com> | 2018-01-23 17:56:50 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2018-01-23 17:56:50 -0500 |
| commit | 3ff92ba1ee54a9400aac143f4d98d356dc6a8321 (patch) | |
| tree | 97bae51783d202fbe0bd447b5f5f4742679b89ed /src/nvim/eval.c | |
| parent | 15119f943ab8c2d089f45969da06b6b58b4d0036 (diff) | |
| download | rneovim-3ff92ba1ee54a9400aac143f4d98d356dc6a8321.tar.gz rneovim-3ff92ba1ee54a9400aac143f4d98d356dc6a8321.tar.bz2 rneovim-3ff92ba1ee54a9400aac143f4d98d356dc6a8321.zip | |
eval: save_tv_as_string: Correctly handle an empty string
When tv_get_string_chk returns a non-NULL value, we have a valid string.
Propagating an error state (*len = -1, NULL return) for an empty string
is invalid.
Closes #6554
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index f663d13c55..07a9e9286d 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -17504,7 +17504,8 @@ static char *save_tv_as_string(typval_T *tv, ptrdiff_t *const len, bool endnl) // print an error. if (tv->v_type != VAR_LIST && tv->v_type != VAR_NUMBER) { const char *ret = tv_get_string_chk(tv); - if (ret && (*len = strlen(ret))) { + if (ret) { + *len = strlen(ret); return xmemdupz(ret, (size_t)(*len)); } else { *len = -1; |