IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18522 from zeertzjq/vim-8.2.4901

Browse Source 
vim-patch:8.2.{4901,4938}: NULL pointer access when using invalid pattern
This commit is contained in:
zeertzjq 2022-05-11 19:47:05 +08:00 committed by GitHub
commit b13089c956
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/buffer.c
View File

@ -2366,7 +2366,7 @@ static char_u *buflist_match(regmatch_T *rmp, buf_T *buf, bool ignore_case)
{ {
// First try the short file name, then the long file name. // First try the short file name, then the long file name.
char_u *match = fname_match(rmp, buf->b_sfname, ignore_case); char_u *match = fname_match(rmp, buf->b_sfname, ignore_case);
if (match == NULL) { if (match == NULL && rmp->regprog != NULL) {
match = fname_match(rmp, buf->b_ffname, ignore_case); match = fname_match(rmp, buf->b_ffname, ignore_case);
} }
return match; return match;
@ -2387,7 +2387,7 @@ static char_u *fname_match(regmatch_T *rmp, char_u *name, bool ignore_case)
rmp->rm_ic = p_fic || ignore_case; rmp->rm_ic = p_fic || ignore_case;
if (vim_regexec(rmp, name, (colnr_T)0)) { if (vim_regexec(rmp, name, (colnr_T)0)) {
match = name; match = name;
} else { } else if (rmp->regprog != NULL) {
// Replace $(HOME) with '~' and try matching again. // Replace $(HOME) with '~' and try matching again.
p = home_replace_save(NULL, name); p = home_replace_save(NULL, name);
if (vim_regexec(rmp, p, (colnr_T)0)) { if (vim_regexec(rmp, p, (colnr_T)0)) {

11
src/nvim/testdir/test_buffer.vim
View File

@ -61,4 +61,15 @@ func Test_buffer_scheme()
set shellslash& set shellslash&
endfunc endfunc
" this was using a NULL pointer after failing to use the pattern
func Test_buf_pattern_invalid()
vsplit 0000000
silent! buf [0--]\&\zs*\zs*e
bwipe!
vsplit 00000000000000000000000000
silent! buf [0--]\&\zs*\zs*e
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab