Karsten Hopp 455cda
To: vim_dev@googlegroups.com
Karsten Hopp 455cda
Subject: Patch 7.4.253
Karsten Hopp 455cda
Fcc: outbox
Karsten Hopp 455cda
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 455cda
Mime-Version: 1.0
Karsten Hopp 455cda
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 455cda
Content-Transfer-Encoding: 8bit
Karsten Hopp 455cda
------------
Karsten Hopp 455cda
Karsten Hopp 455cda
Patch 7.4.253
Karsten Hopp 455cda
Problem:    Crash when using cpp syntax file with pattern using external
Karsten Hopp 455cda
	    match. (Havard Garnes)
Karsten Hopp 455cda
Solution:   Discard match when end column is before start column.
Karsten Hopp 455cda
Files:	    src/regexp.c, src/regexp_nfa.c
Karsten Hopp 455cda
Karsten Hopp 455cda
Karsten Hopp 455cda
*** ../vim-7.4.252/src/regexp.c	2014-04-02 19:00:53.043644100 +0200
Karsten Hopp 455cda
--- src/regexp.c	2014-04-06 21:26:17.087362776 +0200
Karsten Hopp 455cda
***************
Karsten Hopp 455cda
*** 4146,4152 ****
Karsten Hopp 455cda
  	    {
Karsten Hopp 455cda
  		/* Only accept single line matches. */
Karsten Hopp 455cda
  		if (reg_startzpos[i].lnum >= 0
Karsten Hopp 455cda
! 			&& reg_endzpos[i].lnum == reg_startzpos[i].lnum)
Karsten Hopp 455cda
  		    re_extmatch_out->matches[i] =
Karsten Hopp 455cda
  			vim_strnsave(reg_getline(reg_startzpos[i].lnum)
Karsten Hopp 455cda
  						       + reg_startzpos[i].col,
Karsten Hopp 455cda
--- 4146,4153 ----
Karsten Hopp 455cda
  	    {
Karsten Hopp 455cda
  		/* Only accept single line matches. */
Karsten Hopp 455cda
  		if (reg_startzpos[i].lnum >= 0
Karsten Hopp 455cda
! 			&& reg_endzpos[i].lnum == reg_startzpos[i].lnum
Karsten Hopp 455cda
! 			&& reg_endzpos[i].col >= reg_startzpos[i].col)
Karsten Hopp 455cda
  		    re_extmatch_out->matches[i] =
Karsten Hopp 455cda
  			vim_strnsave(reg_getline(reg_startzpos[i].lnum)
Karsten Hopp 455cda
  						       + reg_startzpos[i].col,
Karsten Hopp 455cda
*** ../vim-7.4.252/src/regexp_nfa.c	2014-03-23 15:12:29.935264336 +0100
Karsten Hopp 455cda
--- src/regexp_nfa.c	2014-04-06 21:16:57.111361553 +0200
Karsten Hopp 455cda
***************
Karsten Hopp 455cda
*** 6781,6788 ****
Karsten Hopp 455cda
  	    {
Karsten Hopp 455cda
  		struct multipos *mpos = &subs.synt.list.multi[i];
Karsten Hopp 455cda
  
Karsten Hopp 455cda
! 		/* Only accept single line matches. */
Karsten Hopp 455cda
! 		if (mpos->start.lnum >= 0 && mpos->start.lnum == mpos->end.lnum)
Karsten Hopp 455cda
  		    re_extmatch_out->matches[i] =
Karsten Hopp 455cda
  			vim_strnsave(reg_getline(mpos->start.lnum)
Karsten Hopp 455cda
  							    + mpos->start.col,
Karsten Hopp 455cda
--- 6781,6790 ----
Karsten Hopp 455cda
  	    {
Karsten Hopp 455cda
  		struct multipos *mpos = &subs.synt.list.multi[i];
Karsten Hopp 455cda
  
Karsten Hopp 455cda
! 		/* Only accept single line matches that are valid. */
Karsten Hopp 455cda
! 		if (mpos->start.lnum >= 0
Karsten Hopp 455cda
! 			&& mpos->start.lnum == mpos->end.lnum
Karsten Hopp 455cda
! 			&& mpos->end.col >= mpos->start.col)
Karsten Hopp 455cda
  		    re_extmatch_out->matches[i] =
Karsten Hopp 455cda
  			vim_strnsave(reg_getline(mpos->start.lnum)
Karsten Hopp 455cda
  							    + mpos->start.col,
Karsten Hopp 455cda
*** ../vim-7.4.252/src/version.c	2014-04-06 21:08:41.315360470 +0200
Karsten Hopp 455cda
--- src/version.c	2014-04-06 21:33:17.271363694 +0200
Karsten Hopp 455cda
***************
Karsten Hopp 455cda
*** 736,737 ****
Karsten Hopp 455cda
--- 736,739 ----
Karsten Hopp 455cda
  {   /* Add new patch number below this line */
Karsten Hopp 455cda
+ /**/
Karsten Hopp 455cda
+     253,
Karsten Hopp 455cda
  /**/
Karsten Hopp 455cda
Karsten Hopp 455cda
-- 
Karsten Hopp 455cda
A day without sunshine is like, well, night.
Karsten Hopp 455cda
Karsten Hopp 455cda
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 455cda
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 455cda
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp 455cda
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///