mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 22:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(inccommand): avoid crash if callback changes inccommand option (#18830)

Browse Source 
clang: Result of operation is garbage or undefined
clang: Uninitialized argument value

Also check for == 's' instead of != 'n' as it is more straightforward.

Also fix another unrelated PVS warning:
PVS/V1071: Return value of win_comp_pos() is not always used
This commit is contained in:
zeertzjq
2022-06-02 03:48:36 +08:00
committed by GitHub
parent 209824ce2c
commit 57a296d899
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/ex_getln.c
View File

@@ -2413,6 +2413,7 @@ static void cmdpreview_show(CommandLineState *s)
int save_w_p_cuc = curwin->w_p_cuc;
bool save_hls = p_hls;
varnumber_T save_changedtick = buf_get_changedtick(curbuf);
bool icm_split = *p_icm == 's'; // inccommand=split
buf_T *cmdpreview_buf;
win_T *cmdpreview_win;
cmdmod_T save_cmdmod = cmdmod;
@@ -2433,7 +2434,7 @@ static void cmdpreview_show(CommandLineState *s)
cmdmod.noswapfile = true; // Disable swap for preview buffer
// Open preview buffer if inccommand=split.
if (*p_icm == 'n') {
if (!icm_split) {
cmdpreview_bufnr = 0;
} else if ((cmdpreview_buf = cmdpreview_open_buf()) == NULL) {
abort();
@@ -2456,7 +2457,7 @@ static void cmdpreview_show(CommandLineState *s)
}
// If inccommand=split and preview callback returns 2, open preview window.
if (*p_icm != 'n' && cmdpreview_type == 2
if (icm_split && cmdpreview_type == 2
&& (cmdpreview_win = cmdpreview_open_win(cmdpreview_buf)) == NULL) {
abort();
}
@@ -2470,7 +2471,7 @@ static void cmdpreview_show(CommandLineState *s)
}
// Close preview window if it's open.
if (*p_icm != 'n' && cmdpreview_type == 2 && cmdpreview_win != NULL) {
if (icm_split && cmdpreview_type == 2 && cmdpreview_win != NULL) {
cmdpreview_close_win();
}
// Clear preview highlights.