# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1447179304 -3600
# Node ID e036defe034e0d1291351d324f8edede8c410369
# Parent  9725f5621a392d2cc0e7454b615b31469be337eb
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.

diff --git a/src/misc2.c b/src/misc2.c
--- 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
--- 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,