diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-05-05 22:16:15 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-05-11 22:30:23 -0400 |
| commit | ae01a5e9f8cde646f369bdf9c6cf1f8679204291 (patch) | |
| tree | 8ed1f8ab3c97fef0d23b201bdfc125845b2dd758 | |
| parent | 55b62a937c27715f7e6c299ae312c38edf08fa74 (diff) | |
| download | rneovim-ae01a5e9f8cde646f369bdf9c6cf1f8679204291.tar.gz rneovim-ae01a5e9f8cde646f369bdf9c6cf1f8679204291.tar.bz2 rneovim-ae01a5e9f8cde646f369bdf9c6cf1f8679204291.zip | |
vim-patch:8.1.1186: readdir() allocates list twice
Problem: readdir() allocates list twice.
Solution: Remove second allocation. Also check for zero length.
https://github.com/vim/vim/commit/334ad415040f9592451ec99498cd99f90d6e33e6
| -rw-r--r-- | src/nvim/eval/funcs.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 217490ad10..c7df1d6753 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -6393,20 +6393,14 @@ static void f_readdir(typval_T *argvars, typval_T *rettv, FunPtr fptr) os_closedir(&dir); } - rettv->vval.v_list = tv_list_alloc(kListLenShouldKnow); - if (rettv->vval.v_list != NULL) { - tv_list_ref(rettv->vval.v_list); + if (rettv->vval.v_list != NULL && ga.ga_len > 0) { sort_strings((char_u **)ga.ga_data, ga.ga_len); for (int i = 0; i < ga.ga_len; i++) { path = ((const char **)ga.ga_data)[i]; tv_list_append_string(rettv->vval.v_list, path, -1); } } - for (int i = 0; i < ga.ga_len; i++) { - xfree(((uint8_t **)ga.ga_data)[i]); - } - - ga_clear(&ga); + ga_clear_strings(&ga); } /* |