astepano / rpms / vim

Forked from rpms/vim 6 years ago
Clone
5dbf14a
To: vim_dev@googlegroups.com
5dbf14a
Subject: Patch 7.4.541
5dbf14a
Fcc: outbox
5dbf14a
From: Bram Moolenaar <Bram@moolenaar.net>
5dbf14a
Mime-Version: 1.0
5dbf14a
Content-Type: text/plain; charset=UTF-8
5dbf14a
Content-Transfer-Encoding: 8bit
5dbf14a
------------
5dbf14a
5dbf14a
Patch 7.4.541
5dbf14a
Problem:    Crash when doing a range assign.
5dbf14a
Solution:   Check for NULL poiter. (Yukihiro Nakadaira)
5dbf14a
Files:	    src/eval.c, src/testdir/test55.in, src/testdir/test55.ok
5dbf14a
5dbf14a
5dbf14a
*** ../vim-7.4.540/src/eval.c	2014-11-19 20:04:43.656099839 +0100
5dbf14a
--- src/eval.c	2014-12-07 00:05:47.404278920 +0100
5dbf14a
***************
5dbf14a
*** 2951,2957 ****
5dbf14a
  	/*
5dbf14a
  	 * Check whether any of the list items is locked
5dbf14a
  	 */
5dbf14a
! 	for (ri = rettv->vval.v_list->lv_first; ri != NULL; )
5dbf14a
  	{
5dbf14a
  	    if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name))
5dbf14a
  		return;
5dbf14a
--- 2951,2957 ----
5dbf14a
  	/*
5dbf14a
  	 * Check whether any of the list items is locked
5dbf14a
  	 */
5dbf14a
! 	for (ri = rettv->vval.v_list->lv_first; ri != NULL && ll_li != NULL; )
5dbf14a
  	{
5dbf14a
  	    if (tv_check_lock(ll_li->li_tv.v_lock, lp->ll_name))
5dbf14a
  		return;
5dbf14a
*** ../vim-7.4.540/src/testdir/test55.in	2014-08-29 09:46:04.262404970 +0200
5dbf14a
--- src/testdir/test55.in	2014-12-07 00:04:41.892976604 +0100
5dbf14a
***************
5dbf14a
*** 401,406 ****
5dbf14a
--- 401,411 ----
5dbf14a
  :  $put =v:exception[:15] . v:exception[-1:-1]
5dbf14a
  :endtry
5dbf14a
  :$put =string(d)
5dbf14a
+ :"
5dbf14a
+ :" test for range assign
5dbf14a
+ :let l = [0]
5dbf14a
+ :let l[:] = [1, 2]
5dbf14a
+ :$put =string(l)
5dbf14a
  :endfun
5dbf14a
  :"
5dbf14a
  :call Test(1, 2, [3, 4], {5: 6})  " This may take a while
5dbf14a
*** ../vim-7.4.540/src/testdir/test55.ok	2014-08-29 09:46:04.266404970 +0200
5dbf14a
--- src/testdir/test55.ok	2014-12-07 00:05:08.208695651 +0100
5dbf14a
***************
5dbf14a
*** 129,134 ****
5dbf14a
--- 129,135 ----
5dbf14a
  {'a': {'b': 'B'}}
5dbf14a
  Vim(call):E737: a
5dbf14a
  {'a': {'b': 'B'}}
5dbf14a
+ [1, 2]
5dbf14a
  Vim(foldopen):E490:
5dbf14a
  
5dbf14a
  
5dbf14a
*** ../vim-7.4.540/src/version.c	2014-11-30 22:51:00.629191482 +0100
5dbf14a
--- src/version.c	2014-12-07 00:04:11.237300854 +0100
5dbf14a
***************
5dbf14a
*** 743,744 ****
5dbf14a
--- 743,746 ----
5dbf14a
  {   /* Add new patch number below this line */
5dbf14a
+ /**/
5dbf14a
+     541,
5dbf14a
  /**/
5dbf14a
5dbf14a
-- 
5dbf14a
Any resemblance between the above views and those of my employer, my terminal,
5dbf14a
or the view out my window are purely coincidental.  Any resemblance between
5dbf14a
the above and my own views is non-deterministic.  The question of the
5dbf14a
existence of views in the absence of anyone to hold them is left as an
5dbf14a
exercise for the reader.  The question of the existence of the reader is left
5dbf14a
as an exercise for the second god coefficient.  (A discussion of
5dbf14a
non-orthogonal, non-integral polytheism is beyond the scope of this article.)
5dbf14a
						(Ralph Jennings)
5dbf14a
5dbf14a
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
5dbf14a
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
5dbf14a
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
5dbf14a
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///