To: vim_dev@googlegroups.com

Subject: Patch 7.4.916

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

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.

Files:      src/misc2.c

*** ../vim-7.4.915/src/misc2.c	2015-09-29 12:08:39.333321460 +0200

--- src/misc2.c	2015-11-10 19:00:23.267871297 +0100

***************

*** 952,960 ****

  	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)

--- 952,957 ----

*** ../vim-7.4.915/src/version.c	2015-11-10 17:50:20.717430483 +0100

--- src/version.c	2015-11-10 19:00:39.775708047 +0100

***************

*** 743,744 ****

--- 743,746 ----

  {   /* Add new patch number below this line */

+ /**/

+     916,

  /**/

-- 

I AM THANKFUL...

...for the taxes that I pay because it means that I am employed.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\  an exciting new programming language -- http://www.Zimbu.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///