mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-04 22:59:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.2088: Redundant NULL checks in find_pattern_in_path() (#37432)

Browse Source 
Problem:  Redundant NULL checks in find_pattern_in_path().
Solution: Remove the NULL checks. Also fix typos in test_diffmode.vim
          (zeertzjq).

After assigning to inc_opt on line 2976, it's dereferenced immediately,
and not assigned another value afterwards, so checking for NULL after
line 2977 is redundant.

closes: vim/vim#19185

ce394b13e9
This commit is contained in:
zeertzjq
2026-01-17 06:34:34 +08:00
committed by GitHub
parent dde914f926
commit 03494ad048
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/search.c
View File

@@ -3003,7 +3003,7 @@ void find_pattern_in_path(char *ptr, Direction dir, size_t len, bool whole, bool
char *p_fname = (curr_fname == curbuf->b_fname) char *p_fname = (curr_fname == curbuf->b_fname)
? curbuf->b_ffname : curr_fname; ? curbuf->b_ffname : curr_fname;
if (inc_opt != NULL && strstr(inc_opt, "\\zs") != NULL) { if (strstr(inc_opt, "\\zs") != NULL) {
// Use text from '\zs' to '\ze' (or end) of 'include'. // Use text from '\zs' to '\ze' (or end) of 'include'.
new_fname = find_file_name_in_path(incl_regmatch.startp[0], new_fname = find_file_name_in_path(incl_regmatch.startp[0],
(size_t)(incl_regmatch.endp[0] (size_t)(incl_regmatch.endp[0]
@@ -3077,8 +3077,7 @@ void find_pattern_in_path(char *ptr, Direction dir, size_t len, bool whole, bool
} else { } else {
// Isolate the file name. // Isolate the file name.
// Include the surrounding "" or <> if present. // Include the surrounding "" or <> if present.
if (inc_opt != NULL if (strstr(inc_opt, "\\zs") != NULL) {
&& strstr(inc_opt, "\\zs") != NULL) {
// pattern contains \zs, use the match // pattern contains \zs, use the match
p = incl_regmatch.startp[0]; p = incl_regmatch.startp[0];
i = (int)(incl_regmatch.endp[0] i = (int)(incl_regmatch.endp[0]

2
test/old/testdir/test_diffmode.vim
View File

@@ -3311,7 +3311,7 @@ func Test_diff_add_prop_in_autocmd()
call term_sendkeys(buf, ":diffsplit Xdiffsplit_file\<CR>") call term_sendkeys(buf, ":diffsplit Xdiffsplit_file\<CR>")
call VerifyScreenDump(buf, 'Test_diff_add_prop_in_autocmd_01', {}) call VerifyScreenDump(buf, 'Test_diff_add_prop_in_autocmd_01', {})
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
endfunc endfunc
" this was causing a use-after-free by calling winframe_remove() recursively " this was causing a use-after-free by calling winframe_remove() recursively