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

fix(float): handle error in win_float_create() (#29742)

Browse Source 
Problem: Missing error handling in win_float_create() function.
Solution: Add an inline function for error handling.
This commit is contained in:
glepnir 2024-07-17 20:22:59 +08:00 committed by GitHub
parent 5d7fd74397
commit 8ddcf9d939
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/nvim/winfloat.c
View File

@ -17,6 +17,7 @@
#include "nvim/grid_defs.h" #include "nvim/grid_defs.h"
#include "nvim/macros_defs.h" #include "nvim/macros_defs.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/option.h" #include "nvim/option.h"
@ -359,6 +360,21 @@ win_T *win_float_find_altwin(const win_T *win, const tabpage_T *tp)
: tp->tp_firstwin; : tp->tp_firstwin;
} }
/// Inline helper function for handling errors and cleanup in win_float_create.
static inline win_T *handle_error_and_cleanup(win_T *wp, Error *err)
{
if (ERROR_SET(err)) {
emsg(err->msg);
api_clear_error(err);
}
if (wp) {
win_remove(wp, NULL);
win_free(wp, NULL);
}
unblock_autocmds();
return NULL;
}
/// create a floating preview window. /// create a floating preview window.
/// ///
/// @param[in] bool enter floating window. /// @param[in] bool enter floating window.
@ -381,23 +397,25 @@ win_T *win_float_create(bool enter, bool new_buf)
block_autocmds(); block_autocmds();
win_T *wp = win_new_float(NULL, false, config, &err); win_T *wp = win_new_float(NULL, false, config, &err);
if (!wp) { if (!wp) {
unblock_autocmds(); return handle_error_and_cleanup(wp, &err);
return NULL;
} }
if (new_buf) { if (new_buf) {
Buffer b = nvim_create_buf(false, true, &err); Buffer b = nvim_create_buf(false, true, &err);
if (!b) { if (!b) {
win_remove(wp, NULL); return handle_error_and_cleanup(wp, &err);
win_free(wp, NULL);
unblock_autocmds();
return NULL;
} }
buf_T *buf = find_buffer_by_handle(b, &err); buf_T *buf = find_buffer_by_handle(b, &err);
if (!buf) {
return handle_error_and_cleanup(wp, &err);
}
buf->b_p_bl = false; // unlist buf->b_p_bl = false; // unlist
set_option_direct_for(kOptBufhidden, STATIC_CSTR_AS_OPTVAL("wipe"), OPT_LOCAL, 0, kOptReqBuf, set_option_direct_for(kOptBufhidden, STATIC_CSTR_AS_OPTVAL("wipe"), OPT_LOCAL, 0, kOptReqBuf,
buf); buf);
win_set_buf(wp, buf, &err); win_set_buf(wp, buf, &err);
if (ERROR_SET(&err)) {
return handle_error_and_cleanup(wp, &err);
}
} }
unblock_autocmds(); unblock_autocmds();
wp->w_p_diff = false; wp->w_p_diff = false;