Mercurial > vim

changeset 7214:e036defe034e v7.4.916

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/8648357841065295e39831d2b559d87ca01a7a7c Author: Bram Moolenaar <Bram@vim.org> Date: Tue Nov 10 19:04:23 2015 +0100 patch 7.4.916 Problem: When running out of memory while copying a dict memory may be freed twice. (ZyX) Solution: Do not call the garbage collector when running out of memory.
author Christian Brabandt <cb@256bit.org>
date Tue, 10 Nov 2015 19:15:04 +0100
parents 9725f5621a39
children a22e3bf151ca
files src/misc2.c src/version.c
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -952,9 +952,6 @@ lalloc(size, message)
 
 	clear_sb_text();	      /* free any scrollback text */
 	try_again = mf_release_all(); /* release as many blocks as possible */
-#ifdef FEAT_EVAL
-	try_again |= garbage_collect(); /* cleanup recursive lists/dicts */
-#endif
 
 	releasing = FALSE;
 	if (!try_again)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    916,
+/**/
     915,
 /**/
     914,