lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
07b871d
To: vim_dev@googlegroups.com
07b871d
Subject: Patch 7.4.2
07b871d
Fcc: outbox
07b871d
From: Bram Moolenaar <Bram@moolenaar.net>
07b871d
Mime-Version: 1.0
07b871d
Content-Type: text/plain; charset=UTF-8
07b871d
Content-Transfer-Encoding: 8bit
07b871d
------------
07b871d
07b871d
Patch 7.4.256 (after 7.4.248)
07b871d
Problem:    Using systemlist() may cause a crash and does not handle NUL
07b871d
	    characters properly.
07b871d
Solution:   Increase the reference count, allocate memory by length. (Yasuhiro
07b871d
	    Matsumoto)
07b871d
Files:	    src/eval.c
07b871d
07b871d
07b871d
*** ../vim-7.4.255/src/eval.c	2014-04-05 21:28:50.667174384 +0200
07b871d
--- src/eval.c	2014-04-11 10:10:22.112217827 +0200
07b871d
***************
07b871d
*** 18334,18349 ****
07b871d
  	for (i = 0; i < len; ++i)
07b871d
  	{
07b871d
  	    start = res + i;
07b871d
! 	    for (end = start; i < len && *end != NL; ++end)
07b871d
  		++i;
07b871d
  
07b871d
! 	    s = vim_strnsave(start, (int)(end - start));
07b871d
  	    if (s == NULL)
07b871d
  		goto errret;
07b871d
  
07b871d
! 	    for (p = s, end = s + (end - start); p < end; ++p)
07b871d
! 		if (*p == NUL)
07b871d
! 		    *p = NL;
07b871d
  
07b871d
  	    li = listitem_alloc();
07b871d
  	    if (li == NULL)
07b871d
--- 18334,18350 ----
07b871d
  	for (i = 0; i < len; ++i)
07b871d
  	{
07b871d
  	    start = res + i;
07b871d
! 	    while (i < len && res[i] != NL)
07b871d
  		++i;
07b871d
+ 	    end = res + i;
07b871d
  
07b871d
! 	    s = alloc((unsigned)(end - start + 1));
07b871d
  	    if (s == NULL)
07b871d
  		goto errret;
07b871d
  
07b871d
! 	    for (p = s; start < end; ++p, ++start)
07b871d
! 		*p = *start == NUL ? NL : *start;
07b871d
! 	    *p = NUL;
07b871d
  
07b871d
  	    li = listitem_alloc();
07b871d
  	    if (li == NULL)
07b871d
***************
07b871d
*** 18356,18361 ****
07b871d
--- 18357,18363 ----
07b871d
  	    list_append(list, li);
07b871d
  	}
07b871d
  
07b871d
+ 	++list->lv_refcount;
07b871d
  	rettv->v_type = VAR_LIST;
07b871d
  	rettv->vval.v_list = list;
07b871d
  	list = NULL;
07b871d
*** ../vim-7.4.255/src/version.c	2014-04-10 20:00:03.720106386 +0200
07b871d
--- src/version.c	2014-04-11 09:44:05.208214383 +0200
07b871d
***************
07b871d
*** 736,737 ****
07b871d
--- 736,739 ----
07b871d
  {   /* Add new patch number below this line */
07b871d
+ /**/
07b871d
+     256,
07b871d
  /**/
07b871d
07b871d
-- 
07b871d
hundred-and-one symptoms of being an internet addict:
07b871d
46. Your wife makes a new rule: "The computer cannot come to bed."
07b871d
07b871d
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
07b871d
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
07b871d
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
07b871d
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///