Karsten Hopp 81c285
To: vim-dev@vim.org
Karsten Hopp 81c285
Subject: Patch 7.2.214
Karsten Hopp 81c285
Fcc: outbox
Karsten Hopp 81c285
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 81c285
Mime-Version: 1.0
Karsten Hopp 81c285
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 81c285
Content-Transfer-Encoding: 8bit
Karsten Hopp 81c285
------------
Karsten Hopp 81c285
Karsten Hopp 81c285
Patch 7.2.214
Karsten Hopp 81c285
Problem:    Crash with complete function for user command. (Andy Wokula)
Karsten Hopp 81c285
Solution:   Avoid using a NULL pointer (Dominique Pelle)
Karsten Hopp 81c285
Files:	    src/ex_getln.c
Karsten Hopp 81c285
Karsten Hopp 81c285
Karsten Hopp 81c285
*** ../vim-7.2.213/src/ex_getln.c	2009-05-16 17:29:37.000000000 +0200
Karsten Hopp 81c285
--- src/ex_getln.c	2009-06-24 16:57:28.000000000 +0200
Karsten Hopp 81c285
***************
Karsten Hopp 81c285
*** 4874,4887 ****
Karsten Hopp 81c285
      /* Loop over the items in the list. */
Karsten Hopp 81c285
      for (li = retlist->lv_first; li != NULL; li = li->li_next)
Karsten Hopp 81c285
      {
Karsten Hopp 81c285
! 	if (li->li_tv.v_type != VAR_STRING)
Karsten Hopp 81c285
! 	    continue;  /* Skip non-string items */
Karsten Hopp 81c285
  
Karsten Hopp 81c285
  	if (ga_grow(&ga, 1) == FAIL)
Karsten Hopp 81c285
  	    break;
Karsten Hopp 81c285
  
Karsten Hopp 81c285
  	((char_u **)ga.ga_data)[ga.ga_len] =
Karsten Hopp 81c285
! 	    vim_strsave(li->li_tv.vval.v_string);
Karsten Hopp 81c285
  	++ga.ga_len;
Karsten Hopp 81c285
      }
Karsten Hopp 81c285
      list_unref(retlist);
Karsten Hopp 81c285
--- 4874,4887 ----
Karsten Hopp 81c285
      /* Loop over the items in the list. */
Karsten Hopp 81c285
      for (li = retlist->lv_first; li != NULL; li = li->li_next)
Karsten Hopp 81c285
      {
Karsten Hopp 81c285
! 	if (li->li_tv.v_type != VAR_STRING || li->li_tv.vval.v_string == NULL)
Karsten Hopp 81c285
! 	    continue;  /* Skip non-string items and empty strings */
Karsten Hopp 81c285
  
Karsten Hopp 81c285
  	if (ga_grow(&ga, 1) == FAIL)
Karsten Hopp 81c285
  	    break;
Karsten Hopp 81c285
  
Karsten Hopp 81c285
  	((char_u **)ga.ga_data)[ga.ga_len] =
Karsten Hopp 81c285
! 					 vim_strsave(li->li_tv.vval.v_string);
Karsten Hopp 81c285
  	++ga.ga_len;
Karsten Hopp 81c285
      }
Karsten Hopp 81c285
      list_unref(retlist);
Karsten Hopp 81c285
*** ../vim-7.2.213/src/version.c	2009-06-24 16:49:50.000000000 +0200
Karsten Hopp 81c285
--- src/version.c	2009-06-24 17:03:58.000000000 +0200
Karsten Hopp 81c285
***************
Karsten Hopp 81c285
*** 678,679 ****
Karsten Hopp 81c285
--- 678,681 ----
Karsten Hopp 81c285
  {   /* Add new patch number below this line */
Karsten Hopp 81c285
+ /**/
Karsten Hopp 81c285
+     214,
Karsten Hopp 81c285
  /**/
Karsten Hopp 81c285
Karsten Hopp 81c285
-- 
Karsten Hopp 81c285
He who laughs last, thinks slowest.
Karsten Hopp 81c285
Karsten Hopp 81c285
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 81c285
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 81c285
\\\        download, build and distribute -- http://www.A-A-P.org        ///
Karsten Hopp 81c285
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///