mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 07:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1638

Browse Source 
Problem:    When binding a function to a dict the reference count is wrong.
Solution:   Decrement dict reference count, only reference the function when
            actually making a copy. (Ken Takata)

e4eb6ff089
This commit is contained in:
Michael Ennen
2016-10-27 15:19:26 -07:00
committed by James McCoy
parent bae31b764a
commit 1945013eb7
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/eval.c
View File

@@ -9590,6 +9590,7 @@ static void partial_free(partial_T *pt)
clear_tv(&pt->pt_argv[i]); clear_tv(&pt->pt_argv[i]);
} }
xfree(pt->pt_argv); xfree(pt->pt_argv);
dict_unref(pt->pt_dict);
func_unref(pt->pt_name); func_unref(pt->pt_name);
xfree(pt->pt_name); xfree(pt->pt_name);
xfree(pt); xfree(pt);
@@ -18385,14 +18386,18 @@ handle_subscript (
pt->pt_dict = selfdict; pt->pt_dict = selfdict;
selfdict = NULL; selfdict = NULL;
if (rettv->v_type == VAR_FUNC) { if (rettv->v_type == VAR_FUNC) {
// just a function: use selfdict // Just a function: Take over the function name and use
// selfdict.
pt->pt_name = rettv->vval.v_string; pt->pt_name = rettv->vval.v_string;
} else { } else {
partial_T *ret_pt = rettv->vval.v_partial; partial_T *ret_pt = rettv->vval.v_partial;
int i; int i;
// partial: use selfdict and copy args // Partial: copy the function name, use selfdict and copy
// args. Can't take over name or args, the partial might
// be referenced elsewhere.
pt->pt_name = vim_strsave(ret_pt->pt_name); pt->pt_name = vim_strsave(ret_pt->pt_name);
func_ref(pt->pt_name);
if (ret_pt->pt_argc > 0) { if (ret_pt->pt_argc > 0) {
size_t arg_size = sizeof(typval_T) * ret_pt->pt_argc; size_t arg_size = sizeof(typval_T) * ret_pt->pt_argc;
pt->pt_argv = (typval_T *)xmalloc(arg_size); pt->pt_argv = (typval_T *)xmalloc(arg_size);
@@ -18408,7 +18413,6 @@ handle_subscript (
} }
partial_unref(ret_pt); partial_unref(ret_pt);
} }
func_ref(pt->pt_name);
rettv->v_type = VAR_PARTIAL; rettv->v_type = VAR_PARTIAL;
rettv->vval.v_partial = pt; rettv->vval.v_partial = pt;
} }

2
src/nvim/version.c
View File

@@ -804,7 +804,7 @@ static int included_patches[] = {
1641, 1641,
1640, 1640,
// 1639, // 1639,
// 1638, 1638,
// 1637 NA // 1637 NA
// 1636 NA // 1636 NA
// 1635 NA // 1635 NA