lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
e084005
To: vim_dev@googlegroups.com
e084005
Subject: Patch 7.4.916
e084005
Fcc: outbox
e084005
From: Bram Moolenaar <Bram@moolenaar.net>
e084005
Mime-Version: 1.0
e084005
Content-Type: text/plain; charset=UTF-8
e084005
Content-Transfer-Encoding: 8bit
e084005
------------
e084005
e084005
Patch 7.4.916
e084005
Problem:    When running out of memory while copying a dict memory may be
e084005
            freed twice. (ZyX)
e084005
Solution:   Do not call the garbage collector when running out of memory.
e084005
Files:      src/misc2.c
e084005
e084005
e084005
*** ../vim-7.4.915/src/misc2.c	2015-09-29 12:08:39.333321460 +0200
e084005
--- src/misc2.c	2015-11-10 19:00:23.267871297 +0100
e084005
***************
e084005
*** 952,960 ****
e084005
  
e084005
  	clear_sb_text();	      /* free any scrollback text */
e084005
  	try_again = mf_release_all(); /* release as many blocks as possible */
e084005
- #ifdef FEAT_EVAL
e084005
- 	try_again |= garbage_collect(); /* cleanup recursive lists/dicts */
e084005
- #endif
e084005
  
e084005
  	releasing = FALSE;
e084005
  	if (!try_again)
e084005
--- 952,957 ----
e084005
*** ../vim-7.4.915/src/version.c	2015-11-10 17:50:20.717430483 +0100
e084005
--- src/version.c	2015-11-10 19:00:39.775708047 +0100
e084005
***************
e084005
*** 743,744 ****
e084005
--- 743,746 ----
e084005
  {   /* Add new patch number below this line */
e084005
+ /**/
e084005
+     916,
e084005
  /**/
e084005
e084005
-- 
e084005
I AM THANKFUL...
e084005
...for the taxes that I pay because it means that I am employed.
e084005
e084005
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
e084005
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
e084005
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
e084005
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///