diff options
| author | James McCoy <jamessan@jamessan.com> | 2020-05-15 10:36:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-15 10:36:32 -0400 |
| commit | e2a33a6622193df383870903cd39a3080c890d4d (patch) | |
| tree | d92783cac8745057428b5f0e27094acb60c49d53 /src/nvim/eval/funcs.c | |
| parent | da6f38ab3cd87615e212b83ff9bbb9d585e4768e (diff) | |
| parent | 076b0949d045d19decb2625c04128200ce8a987f (diff) | |
| download | rneovim-e2a33a6622193df383870903cd39a3080c890d4d.tar.gz rneovim-e2a33a6622193df383870903cd39a3080c890d4d.tar.bz2 rneovim-e2a33a6622193df383870903cd39a3080c890d4d.zip | |
Merge pull request #12259 from janlazo/vim-8.1.1186
Diffstat (limited to 'src/nvim/eval/funcs.c')
| -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); } /* |