Mercurial > vim
changeset 13082:a80082fd1a1d v8.0.1416
patch 8.0.1416: crash when searching for a sentence
commit https://github.com/vim/vim/commit/8ada6aa9298b4764d9ca0024dd21b17e815595ce
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Dec 19 21:23:21 2017 +0100
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 https://github.com/vim/vim/issues/2468)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 19 Dec 2017 21:30:05 +0100 |
| parents | 25aefadfcd81 |
| children | 2b7dcbf6426a |
| files | src/ex_docmd.c src/misc1.c src/misc2.c src/testdir/test_search.vim src/version.c |
| diffstat | 5 files changed, 38 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -4521,13 +4521,14 @@ get_address( 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;
--- a/src/misc1.c +++ b/src/misc1.c @@ -2650,8 +2650,12 @@ del_lines( int 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 if (has_mbyte) return (*mb_ptr2char)(ptr);
--- a/src/misc2.c +++ b/src/misc2.c @@ -348,24 +348,29 @@ inc_cursor(void) 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) */ + char_u *p; + + /* when searching position may be set to end of a line */ + if (lp->col != MAXCOL) { -#ifdef FEAT_MBYTE - if (has_mbyte) + p = ml_get_pos(lp); + if (*p != NUL) /* still within line, move to next char (may be NUL) */ { - int l = (*mb_ptr2len)(p); - - lp->col += l; - return ((p[l] != NUL) ? 0 : 2); +#ifdef FEAT_MBYTE + if (has_mbyte) + { + int l = (*mb_ptr2len)(p); + + lp->col += l; + return ((p[l] != NUL) ? 0 : 2); + } +#endif + lp->col++; +#ifdef FEAT_VIRTUALEDIT + lp->coladd = 0; +#endif + return ((p[1] != NUL) ? 0 : 2); } -#endif - lp->col++; -#ifdef FEAT_VIRTUALEDIT - lp->coladd = 0; -#endif - return ((p[1] != NUL) ? 0 : 2); } if (lp->lnum != curbuf->b_ml.ml_line_count) /* there is a next line */ {
--- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -729,3 +729,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