Mercurial > vim

changeset 8581:fd454847836d v7.4.1580

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/7a5c46a9df7ef01a4f6a620861c35400d5ad28d9 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Mar 16 20:41:21 2016 +0100 patch 7.4.1580 Problem: Crash when using function reference. (Luchr) Solution: Set initial refcount. (Ken Takata, closes https://github.com/vim/vim/issues/690)
author Christian Brabandt <cb@256bit.org>
date Wed, 16 Mar 2016 20:45:05 +0100
parents 594b539a8feb
children ddbe8ab9f8a4
files src/eval.c src/testdir/test_partial.vim src/version.c
diffstat 3 files changed, 17 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/eval.c
+++ b/src/eval.c
@@ -21705,6 +21705,7 @@ handle_subscript(
 	/* Turn "dict.Func" into a partial for "Func" with "dict". */
 	if (pt != NULL)
 	{
+	    pt->pt_refcount = 1;
 	    pt->pt_dict = selfdict;
 	    selfdict = NULL;
 	    pt->pt_name = rettv->vval.v_string;
--- a/src/testdir/test_partial.vim
+++ b/src/testdir/test_partial.vim
@@ -68,3 +68,17 @@ func Test_partial_implicit()
 
   call assert_fails('call function(dict.MyFunc, ["bbb"], dict)', 'E924:')
 endfunc
+
+fun InnerCall(funcref)
+  return a:funcref
+endfu
+
+fun OuterCall()
+  let opt = { 'func' : function('sin') }
+  call InnerCall(opt.func)
+endfu
+
+func Test_function_in_dict()
+  call OuterCall()
+endfunc
+
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1580,
+/**/
     1579,
 /**/
     1578,