diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-11-10 19:04:23 +0100 |
|---|---|---|
| committer | Dan Pasanen <dan.pasanen@gmail.com> | 2015-11-24 10:06:17 -0600 |
| commit | 8cfe977263b46dc2dac3cd06761da713891c983f (patch) | |
| tree | e7ff7ee735083ea46b779e8f006a8733a1a5d581 | |
| parent | 7c7735fb4d08de9cc27cca63e12d7e0d6c37f6f4 (diff) | |
| download | android_external_vim-8cfe977263b46dc2dac3cd06761da713891c983f.tar.gz android_external_vim-8cfe977263b46dc2dac3cd06761da713891c983f.tar.bz2 android_external_vim-8cfe977263b46dc2dac3cd06761da713891c983f.zip | |
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.
| -rw-r--r-- | src/misc2.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/misc2.c b/src/misc2.c index 6ac1e5fa5..3f1568d10 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 4fb004d72..8effc142b 100644 --- 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, |