mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
vim-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 vim/vim#2468)
8ada6aa929
This commit is contained in:
parent
9f1401e25c
commit
91352b36b7
@ -3665,13 +3665,14 @@ static linenr_T get_address(exarg_T *eap,
|
||||
if (lnum != MAXLNUM)
|
||||
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.
|
||||
* This makes sure we never match in the current
|
||||
* line, and can match anywhere in the
|
||||
* next/previous line.
|
||||
*/
|
||||
if (c == '/')
|
||||
if (c == '/' && curwin->w_cursor.lnum > 0)
|
||||
curwin->w_cursor.col = MAXCOL;
|
||||
else
|
||||
curwin->w_cursor.col = 0;
|
||||
|
@ -3999,18 +3999,15 @@ void goto_byte(long cnt)
|
||||
/// Return 0 otherwise.
|
||||
int inc(pos_T *lp)
|
||||
{
|
||||
char_u *p = ml_get_pos(lp);
|
||||
|
||||
if (*p != NUL) { // still within line, move to next char (may be NUL)
|
||||
if (has_mbyte) {
|
||||
int l = (*mb_ptr2len)(p);
|
||||
// when searching position may be set to end of a line
|
||||
if (lp->col != MAXCOL) {
|
||||
const char_u *const p = ml_get_pos(lp);
|
||||
if (*p != NUL) { // still within line, move to next char (may be NUL)
|
||||
const int l = utfc_ptr2len(p);
|
||||
|
||||
lp->col += l;
|
||||
return (p[l] != NUL) ? 0 : 2;
|
||||
return ((p[l] != NUL) ? 0 : 2);
|
||||
}
|
||||
lp->col++;
|
||||
lp->coladd = 0;
|
||||
return (p[1] != NUL) ? 0 : 2;
|
||||
}
|
||||
if (lp->lnum != curbuf->b_ml.ml_line_count) { // there is a next line
|
||||
lp->col = 0;
|
||||
|
@ -1752,6 +1752,10 @@ del_lines (
|
||||
|
||||
int gchar_pos(pos_T *pos)
|
||||
{
|
||||
// When searching columns is sometimes put at the end of a line.
|
||||
if (pos->col == MAXCOL) {
|
||||
return NUL;
|
||||
}
|
||||
return utf_ptr2char(ml_get_pos(pos));
|
||||
}
|
||||
|
||||
|
@ -480,3 +480,10 @@ func Test_look_behind()
|
||||
call search(getline("."))
|
||||
bwipe!
|
||||
endfunc
|
||||
|
||||
func Test_search_sentence()
|
||||
new
|
||||
" this used to cause a crash
|
||||
call assert_fails("/\\%'", 'E486')
|
||||
call assert_fails("/", 'E486')
|
||||
endfunc
|
||||
|
Loading…
Reference in New Issue
Block a user