# HG changeset patch # User Christian Brabandt # Date 1464813007 -7200 # Node ID 062eb6d28b0c9b7de501f4d7eaf5ba32d470b850 # Parent fe7386df8418522464be538831cce03bb5fdf0fc commit https://github.com/vim/vim/commit/a96732150cda2f242133228579b05437a39b8daa Author: Bram Moolenaar Date: Wed Jun 1 22:21:06 2016 +0200 patch 7.4.1866 Problem: Invalid memory access when exiting with EXITFREE defined. (Dominique Pelle) Solution: Set "really_exiting" and skip error messages. diff --git a/src/eval.c b/src/eval.c --- a/src/eval.c +++ b/src/eval.c @@ -25348,7 +25348,11 @@ func_unref(char_u *name) { fp = find_func(name); if (fp == NULL) - EMSG2(_(e_intern2), "func_unref()"); + { + /* Ignore when invoked through free_all_mem(). */ + if (!really_exiting) + EMSG2(_(e_intern2), "func_unref()"); + } else if (--fp->uf_refcount <= 0) { /* Only delete it when it's not being used. Otherwise it's done diff --git a/src/misc2.c b/src/misc2.c --- a/src/misc2.c +++ b/src/misc2.c @@ -1044,6 +1044,9 @@ free_all_mem(void) return; entered = TRUE; + /* Set this flag to indicate some errors can be ignored. */ + really_exiting = TRUE; + # ifdef FEAT_AUTOCMD /* Don't want to trigger autocommands from here on. */ block_autocmds(); diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1866, +/**/ 1865, /**/ 1864,