diff options
| author | erw7 <erw7.github@gmail.com> | 2020-05-04 17:50:54 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 10:50:54 +0200 |
| commit | d46c4003cfd6b5f1afcc67b07ed9769d73aa1110 (patch) | |
| tree | 254769cdadee722a911067ca151bce47d6e55ea5 /src/nvim/eval/funcs.c | |
| parent | 496b668ad183411454c9e95f4618624388a939c1 (diff) | |
| download | rneovim-d46c4003cfd6b5f1afcc67b07ed9769d73aa1110.tar.gz rneovim-d46c4003cfd6b5f1afcc67b07ed9769d73aa1110.tar.bz2 rneovim-d46c4003cfd6b5f1afcc67b07ed9769d73aa1110.zip | |
funcs: Fix a memory leak in f_expand (#12227)
:echo expand('%', v:false, v:true)
==423== 28 bytes in 1 blocks are definitely lost in loss record 124 of 420
==423== at 0x4C2FB0F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==423== by 0x2AD09C: try_malloc (memory.c:71)
==423== by 0x2AD0B8: xmalloc (memory.c:105)
==423== by 0x2AE05D: xmallocz (memory.c:182)
==423== by 0x1F7CF4: vim_strnsave (strings.c:68)
==423== by 0x318813: eval_vars (ex_docmd.c:8885)
==423== by 0x34F5FC: f_expand (funcs.c:2058)
==423== by 0x36D023: call_func (eval.c:6419)
==423== by 0x370C28: get_func_tv.lto_priv.707 (eval.c:6150)
==423== by 0x372748: eval7 (eval.c:4326)
==423== by 0x37291A: eval6 (eval.c:4036)
==423== by 0x372BF6: eval5 (eval.c:3884)
Diffstat (limited to 'src/nvim/eval/funcs.c')
| -rw-r--r-- | src/nvim/eval/funcs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index bbe6f6de9d..26e87df6d4 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -2063,8 +2063,10 @@ static void f_expand(typval_T *argvars, typval_T *rettv, FunPtr fptr) if (result != NULL) { tv_list_append_string(rettv->vval.v_list, (const char *)result, -1); } - } else + XFREE_CLEAR(result); + } else { rettv->vval.v_string = result; + } } else { // When the optional second argument is non-zero, don't remove matches // for 'wildignore' and don't put matches for 'suffixes' at the end. |