mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.0.1416: crash when searching for a sentence
Problem: Crash when searching for a sentence. Solution: Return NUL when getting character at MAXCOL. (closes #2468)
This commit is contained in:
parent
4ce46c2a6b
commit
8ada6aa929
@ -4521,13 +4521,14 @@ get_address(
|
|||||||
if (lnum != MAXLNUM)
|
if (lnum != MAXLNUM)
|
||||||
curwin->w_cursor.lnum = lnum;
|
curwin->w_cursor.lnum = lnum;
|
||||||
/*
|
/*
|
||||||
* Start a forward search at the end of the line.
|
* Start a forward search at the end of the line (unless
|
||||||
|
* before the first line).
|
||||||
* Start a backward search at the start of the line.
|
* Start a backward search at the start of the line.
|
||||||
* This makes sure we never match in the current
|
* This makes sure we never match in the current
|
||||||
* line, and can match anywhere in the
|
* line, and can match anywhere in the
|
||||||
* next/previous line.
|
* next/previous line.
|
||||||
*/
|
*/
|
||||||
if (c == '/')
|
if (c == '/' && curwin->w_cursor.lnum > 0)
|
||||||
curwin->w_cursor.col = MAXCOL;
|
curwin->w_cursor.col = MAXCOL;
|
||||||
else
|
else
|
||||||
curwin->w_cursor.col = 0;
|
curwin->w_cursor.col = 0;
|
||||||
|
@ -2650,8 +2650,12 @@ del_lines(
|
|||||||
int
|
int
|
||||||
gchar_pos(pos_T *pos)
|
gchar_pos(pos_T *pos)
|
||||||
{
|
{
|
||||||
char_u *ptr = ml_get_pos(pos);
|
char_u *ptr;
|
||||||
|
|
||||||
|
/* When searching columns is sometimes put at the end of a line. */
|
||||||
|
if (pos->col == MAXCOL)
|
||||||
|
return NUL;
|
||||||
|
ptr = ml_get_pos(pos);
|
||||||
#ifdef FEAT_MBYTE
|
#ifdef FEAT_MBYTE
|
||||||
if (has_mbyte)
|
if (has_mbyte)
|
||||||
return (*mb_ptr2char)(ptr);
|
return (*mb_ptr2char)(ptr);
|
||||||
|
@ -348,8 +348,12 @@ inc_cursor(void)
|
|||||||
int
|
int
|
||||||
inc(pos_T *lp)
|
inc(pos_T *lp)
|
||||||
{
|
{
|
||||||
char_u *p = ml_get_pos(lp);
|
char_u *p;
|
||||||
|
|
||||||
|
/* when searching position may be set to end of a line */
|
||||||
|
if (lp->col != MAXCOL)
|
||||||
|
{
|
||||||
|
p = ml_get_pos(lp);
|
||||||
if (*p != NUL) /* still within line, move to next char (may be NUL) */
|
if (*p != NUL) /* still within line, move to next char (may be NUL) */
|
||||||
{
|
{
|
||||||
#ifdef FEAT_MBYTE
|
#ifdef FEAT_MBYTE
|
||||||
@ -367,6 +371,7 @@ inc(pos_T *lp)
|
|||||||
#endif
|
#endif
|
||||||
return ((p[1] != NUL) ? 0 : 2);
|
return ((p[1] != NUL) ? 0 : 2);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (lp->lnum != curbuf->b_ml.ml_line_count) /* there is a next line */
|
if (lp->lnum != curbuf->b_ml.ml_line_count) /* there is a next line */
|
||||||
{
|
{
|
||||||
lp->col = 0;
|
lp->col = 0;
|
||||||
|
@ -729,3 +729,10 @@ func Test_look_behind()
|
|||||||
call search(getline("."))
|
call search(getline("."))
|
||||||
bwipe!
|
bwipe!
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_search_sentence()
|
||||||
|
new
|
||||||
|
" this used to cause a crash
|
||||||
|
call assert_fails("/\\%'", 'E486')
|
||||||
|
call assert_fails("/", 'E486')
|
||||||
|
endfunc
|
||||||
|
@ -771,6 +771,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1416,
|
||||||
/**/
|
/**/
|
||||||
1415,
|
1415,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user