aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.0704: Vim9: memory leak in disassemble test

Browse Source 
Problem:    Vim9: memory leak in disassemble test.
Solution:   Decrement refcount when creating funccal.
This commit is contained in:
Bram Moolenaar
2020-05-06 22:18:17 +02:00
parent b68b346e6d
commit f821ddaa0c
2 changed files with 29 additions and 1 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 */
/**/
704,
/**/ /**/
703, 703,
/**/ /**/

28
src/vim9execute.c
View File

@@ -270,7 +270,7 @@ handle_closure_in_use(ectx_T *ectx, int free_arguments)
int refcount = tv->vval.v_partial->pt_refcount; int refcount = tv->vval.v_partial->pt_refcount;
int i; int i;
// A Reference in a local variables doesn't count, its get // A Reference in a local variables doesn't count, it gets
// unreferenced on return. // unreferenced on return.
for (i = 0; i < dfunc->df_varcount; ++i) for (i = 0; i < dfunc->df_varcount; ++i)
{ {
@@ -323,6 +323,32 @@ handle_closure_in_use(ectx_T *ectx, int free_arguments)
for (idx = 0; idx < dfunc->df_varcount; ++idx) for (idx = 0; idx < dfunc->df_varcount; ++idx)
{ {
tv = STACK_TV(ectx->ec_frame_idx + STACK_FRAME_SIZE + idx); tv = STACK_TV(ectx->ec_frame_idx + STACK_FRAME_SIZE + idx);
// Do not copy a partial created for a local function.
// TODO: this won't work if the closure actually uses it. But when
// keeping it it gets complicated: it will create a reference cycle
// inside the partial, thus needs special handling for garbage
// collection.
if (tv->v_type == VAR_PARTIAL && tv->vval.v_partial != NULL)
{
int i;
typval_T *ctv;
for (i = 0; i < dfunc->df_closure_count; ++i)
{
ctv = STACK_TV(ectx->ec_frame_idx + STACK_FRAME_SIZE
+ dfunc->df_varcount + i);
if (tv->vval.v_partial == ctv->vval.v_partial)
break;
}
if (i < dfunc->df_closure_count)
{
(stack + argcount + STACK_FRAME_SIZE + idx)->v_type =
VAR_UNKNOWN;
continue;
}
}
*(stack + argcount + STACK_FRAME_SIZE + idx) = *tv; *(stack + argcount + STACK_FRAME_SIZE + idx) = *tv;
tv->v_type = VAR_UNKNOWN; tv->v_type = VAR_UNKNOWN;
} }