# HG changeset patch # User Christian Brabandt # Date 1470061807 -7200 # Node ID 8436bb5134f51c5560c97e39a4796c372e215c60 # Parent 45d404749bb03a9f39572c21f72487035b1da4d4 commit https://github.com/vim/vim/commit/0588d4f9d2741f35a271400a37fddbdd72d84219 Author: Bram Moolenaar Date: Mon Aug 1 16:29:47 2016 +0200 patch 7.4.2139 Problem: :delfunction causes illegal memory access. Solution: Correct logic when deciding to free a function. diff --git a/src/testdir/test_lambda.vim b/src/testdir/test_lambda.vim --- a/src/testdir/test_lambda.vim +++ b/src/testdir/test_lambda.vim @@ -267,7 +267,6 @@ func Test_closure_refcount() call assert_equal(2, g:Count()) call assert_equal(3, g:Count2()) - " This causes memory access errors. - " delfunc LambdaFoo - " delfunc LambdaBar + delfunc LambdaFoo + delfunc LambdaBar endfunc diff --git a/src/userfunc.c b/src/userfunc.c --- a/src/userfunc.c +++ b/src/userfunc.c @@ -2711,7 +2711,7 @@ ex_delfunction(exarg_T *eap) * Numbered functions and lambdas snould be kept if the refcount is * one or more. */ if (fp->uf_refcount > (isdigit(fp->uf_name[0]) - || fp->uf_name[0] == '<') ? 0 : 1) + || fp->uf_name[0] == '<' ? 0 : 1)) { /* Function is still referenced somewhere. Don't free it but * do remove it from the hashtable. */ diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2139, +/**/ 2138, /**/ 2137,