aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.0726: Vim9: leaking memory when calling not compiled :def function

Browse Source 
Problem:    Vim9: leaking memory when calling not compiled :def function.
Solution:   Check if function is compiled earlier.
This commit is contained in:
Bram Moolenaar
2020-05-09 23:20:20 +02:00
parent 09689a0284
commit 3b6a6eb7b4
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
726,
/**/ /**/
725, 725,
/**/ /**/

10
src/vim9execute.c
View File

@@ -665,10 +665,6 @@ call_def_function(
// Like STACK_TV_VAR but use the outer scope // Like STACK_TV_VAR but use the outer scope
#define STACK_OUT_TV_VAR(idx) (((typval_T *)ectx.ec_outer_stack->ga_data) + ectx.ec_outer_frame + STACK_FRAME_SIZE + idx) #define STACK_OUT_TV_VAR(idx) (((typval_T *)ectx.ec_outer_stack->ga_data) + ectx.ec_outer_frame + STACK_FRAME_SIZE + idx)
CLEAR_FIELD(ectx);
ga_init2(&ectx.ec_stack, sizeof(typval_T), 500);
if (ga_grow(&ectx.ec_stack, 20) == FAIL)
return FAIL;
{ {
// Check the function was compiled, it is postponed in ex_vim9script(). // Check the function was compiled, it is postponed in ex_vim9script().
dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data) dfunc_T *dfunc = ((dfunc_T *)def_functions.ga_data)
@@ -676,8 +672,12 @@ call_def_function(
if (dfunc->df_instr == NULL) if (dfunc->df_instr == NULL)
return FAIL; return FAIL;
} }
ectx.ec_dfunc_idx = ufunc->uf_dfunc_idx;
CLEAR_FIELD(ectx);
ectx.ec_dfunc_idx = ufunc->uf_dfunc_idx;
ga_init2(&ectx.ec_stack, sizeof(typval_T), 500);
if (ga_grow(&ectx.ec_stack, 20) == FAIL)
return FAIL;
ga_init2(&ectx.ec_trystack, sizeof(trycmd_T), 10); ga_init2(&ectx.ec_trystack, sizeof(trycmd_T), 10);
// Put arguments on the stack. // Put arguments on the stack.