mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-05-01 19:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): autocmds mess up nvim_get_option_value's dummy buffer

Browse Source 
Problem: When the "filetype" key is set for nvim_get_option_value, autocommands
can crash Nvim by prematurely wiping the dummy buffer, or cause options intended
for it to instead be set for unrelated buffers if switched during OptionSet.

Solution: Don't crash. Also quash side-effects from setting the buffer options.
This commit is contained in:
Sean Dewar
2025-05-09 00:26:07 +01:00
parent 6082b7f850
commit 3cb462a960
2 changed files with 73 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/nvim/api/options.c
View File

@@ -13,6 +13,7 @@
#include "nvim/buffer.h"
#include "nvim/buffer_defs.h"
#include "nvim/globals.h"
#include "nvim/memline.h"
#include "nvim/memory.h"
#include "nvim/memory_defs.h"
#include "nvim/option.h"
@@ -99,8 +100,10 @@ static int validate_option_value_args(Dict(option) *opts, char *name, OptIndex *
}
/// Create a dummy buffer and run the FileType autocmd on it.
static buf_T *do_ft_buf(char *filetype, aco_save_T *aco, Error *err)
static buf_T *do_ft_buf(const char *filetype, aco_save_T *aco, bool *aco_used, Error *err)
FUNC_ATTR_NONNULL_ARG(2, 3, 4)
{
*aco_used = false;
if (filetype == NULL) {
return NULL;
}
@@ -112,19 +115,37 @@ static buf_T *do_ft_buf(char *filetype, aco_save_T *aco, Error *err)
return NULL;
}
// Open a memline for use by autocommands.
if (ml_open(ftbuf) == FAIL) {
api_set_error(err, kErrorTypeException, "Could not load internal buffer");
return ftbuf;
}
bufref_T bufref;
set_bufref(&bufref, ftbuf);
// Set curwin/curbuf to buf and save a few things.
aucmd_prepbuf(aco, ftbuf);
*aco_used = true;
set_option_direct(kOptBufhidden, STATIC_CSTR_AS_OPTVAL("hide"), OPT_LOCAL, SID_NONE);
set_option_direct(kOptBuftype, STATIC_CSTR_AS_OPTVAL("nofile"), OPT_LOCAL, SID_NONE);
assert(ftbuf->b_ml.ml_mfp->mf_fd < 0); // ml_open() should not have opened swapfile already
ftbuf->b_p_swf = false;
ftbuf->b_p_ml = false;
ftbuf->b_p_ft = xstrdup(filetype);
TRY_WRAP(err, {
set_option_value(kOptBufhidden, STATIC_CSTR_AS_OPTVAL("hide"), OPT_LOCAL);
set_option_value(kOptBuftype, STATIC_CSTR_AS_OPTVAL("nofile"), OPT_LOCAL);
set_option_value(kOptSwapfile, BOOLEAN_OPTVAL(false), OPT_LOCAL);
set_option_value(kOptModeline, BOOLEAN_OPTVAL(false), OPT_LOCAL); // 'nomodeline'
ftbuf->b_p_ft = xstrdup(filetype);
do_filetype_autocmd(ftbuf, false);
});
if (!bufref_valid(&bufref)) {
if (!ERROR_SET(err)) {
api_set_error(err, kErrorTypeException, "Internal buffer was deleted");
}
return NULL;
}
return ftbuf;
}
@@ -161,13 +182,15 @@ Object nvim_get_option_value(String name, Dict(option) *opts, Error *err)
}
aco_save_T aco;
bool aco_used;
buf_T *ftbuf = do_ft_buf(filetype, &aco, err);
buf_T *ftbuf = do_ft_buf(filetype, &aco, &aco_used, err);
if (ERROR_SET(err)) {
if (ftbuf != NULL) {
if (aco_used) {
// restore curwin/curbuf and a few other things
aucmd_restbuf(&aco);
}
if (ftbuf != NULL) {
assert(curbuf != ftbuf); // safety check
wipe_buffer(ftbuf, false);
}
@@ -183,9 +206,10 @@ Object nvim_get_option_value(String name, Dict(option) *opts, Error *err)
OptVal value = get_option_value_for(opt_idx, opt_flags, scope, from, err);
if (ftbuf != NULL) {
// restore curwin/curbuf and a few other things
aucmd_restbuf(&aco);
if (aco_used) {
// restore curwin/curbuf and a few other things
aucmd_restbuf(&aco);
}
assert(curbuf != ftbuf); // safety check
wipe_buffer(ftbuf, false);
}