From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 10 Nov 2015 18:04:23 +0000 (+0100)
Subject: patch 7.4.916
X-Git-Tag: v7.4.916
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8648357841065295e39831d2b559d87ca01a7a7c;p=thirdparty%2Fvim.git

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.
---

diff --git a/src/misc2.c b/src/misc2.c
index 6ac1e5fa5f..3f1568d101 100644
--- 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)
diff --git a/src/version.c b/src/version.c
index 4fb004d72e..8effc142bc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    916,
 /**/
     915,
 /**/