diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-05-18 15:09:18 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-05-18 15:09:18 +0200 |
| commit | ecb664501d3b04d124fca69029b275c520401d40 (patch) | |
| tree | d5cd0eb0140b636d75519b0156be5bafe3c92cb7 /src/userfunc.c | |
| parent | d87c21a918d8d611750f22d68fc638bf7a79b1d5 (diff) | |
| download | vim-git-ecb664501d3b04d124fca69029b275c520401d40.tar.gz | |
patch 8.2.2866: Vim9: memory leak when using inline functionv8.2.2866
Problem: Vim9: memory leak when using inline function.
Solution: Remember what strings to free.
Diffstat (limited to 'src/userfunc.c')
| -rw-r--r-- | src/userfunc.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/userfunc.c b/src/userfunc.c index bc7d92384..dd6939c9a 100644 --- a/src/userfunc.c +++ b/src/userfunc.c @@ -976,6 +976,7 @@ lambda_function_body( { int evaluate = (evalarg->eval_flags & EVAL_EVALUATE); garray_T *gap = &evalarg->eval_ga; + garray_T *freegap = &evalarg->eval_freega; ufunc_T *ufunc = NULL; exarg_T eap; garray_T newlines; @@ -1026,7 +1027,7 @@ lambda_function_body( { char_u *p = skipwhite(((char_u **)newlines.ga_data)[idx]); - if (ga_grow(gap, 1) == FAIL) + if (ga_grow(gap, 1) == FAIL || ga_grow(freegap, 1) == FAIL) goto erret; // Going to concatenate the lines after parsing. For an empty or @@ -1039,10 +1040,10 @@ lambda_function_body( pnl = vim_strnsave((char_u *)"\n", plen + 1); if (pnl != NULL) mch_memmove(pnl + 1, p, plen + 1); - ((char_u **)gap->ga_data)[gap->ga_len] = pnl; - ++gap->ga_len; + ((char_u **)gap->ga_data)[gap->ga_len++] = pnl; + ((char_u **)freegap->ga_data)[freegap->ga_len++] = pnl; } - if (ga_grow(gap, 1) == FAIL) + if (ga_grow(gap, 1) == FAIL || ga_grow(freegap, 1) == FAIL) goto erret; if (cmdline != NULL) // more is following after the "}", which was skipped @@ -1054,8 +1055,8 @@ lambda_function_body( pnl = vim_strnsave((char_u *)"\n", plen + 1); if (pnl != NULL) mch_memmove(pnl + 1, last, plen + 1); - ((char_u **)gap->ga_data)[gap->ga_len] = pnl; - ++gap->ga_len; + ((char_u **)gap->ga_data)[gap->ga_len++] = pnl; + ((char_u **)freegap->ga_data)[freegap->ga_len++] = pnl; } if (cmdline != NULL) |