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 6ac1e5fa5f3535a355ee06fba908c7b555ae83c7..3f1568d101e92757e94318efa1d6b73e13fe65ac 100644 (file)
--- 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 4fb004d72e6077315323e4a24ca528db1dd1741d..8effc142bc3c457b5263d374087906c1be8c92b6 100644 (file)
--- 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,
 /**/