aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.916

Browse Source 
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.
This commit is contained in:
Bram Moolenaar 2015-11-10 19:04:23 +01:00
parent 174674743d
commit 8648357841
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/misc2.c
View File

@ -952,9 +952,6 @@ lalloc(size, message)
clear_sb_text(); /* free any scrollback text */ clear_sb_text(); /* free any scrollback text */
try_again = mf_release_all(); /* release as many blocks as possible */ 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; releasing = FALSE;
if (!try_again) if (!try_again)

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
916,
/**/ /**/
915, 915,
/**/ /**/