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

fix(memfile): avoid potential crash on OOM (#37946)

Browse Source 
When running out of memory in a libuv callback, try_to_free_memory()
will call mf_release_all(). In this case, mf_sync() cannot call
os_breakcheck() as it'll run the libuv loop recursively, so check
main_loop.recursive to prevent that.

Also fix another possible problem that a terminal buffer may have a
swapfile when encountering an OOM in e.g. terminal_alloc().
This commit is contained in:
zeertzjq
2026-02-19 06:07:16 +08:00
committed by GitHub
parent 761fbc155a
commit 2154d325d5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/eval/funcs.c
View File

@@ -3611,6 +3611,8 @@ void f_jobstart(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
const int pid = chan->stream.pty.proc.pid; const int pid = chan->stream.pty.proc.pid;
buf_T *const buf = curbuf; buf_T *const buf = curbuf;
// Unset 'swapfile' to ensure no swapfile is created.
buf->b_p_swf = false;
// If the buffer isn't loaded, open a memfile here to avoid spurious autocommands // If the buffer isn't loaded, open a memfile here to avoid spurious autocommands
// from open_buffer() when updating the terminal buffer later. // from open_buffer() when updating the terminal buffer later.
if (buf->b_ml.ml_mfp == NULL && ml_open(buf) == FAIL) { if (buf->b_ml.ml_mfp == NULL && ml_open(buf) == FAIL) {
@@ -3646,8 +3648,6 @@ void f_jobstart(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
// Terminal URI: "term://$CWD//$PID:$CMD" // Terminal URI: "term://$CWD//$PID:$CMD"
snprintf(NameBuff, sizeof(NameBuff), "term://%s//%d:%s", IObuff, pid, cmd); snprintf(NameBuff, sizeof(NameBuff), "term://%s//%d:%s", IObuff, pid, cmd);
// Unset 'swapfile' to ensure no swapfile is created.
buf->b_p_swf = false;
setfname(buf, NameBuff, NULL, true); setfname(buf, NameBuff, NULL, true);
apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, false, buf); apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, false, buf);

3
src/nvim/memfile.c
View File

@@ -50,6 +50,7 @@
#include "nvim/fileio.h" #include "nvim/fileio.h"
#include "nvim/gettext_defs.h" #include "nvim/gettext_defs.h"
#include "nvim/globals.h" #include "nvim/globals.h"
#include "nvim/main.h"
#include "nvim/map_defs.h" #include "nvim/map_defs.h"
#include "nvim/memfile.h" #include "nvim/memfile.h"
#include "nvim/memfile_defs.h" #include "nvim/memfile_defs.h"
@@ -411,7 +412,7 @@ int mf_sync(memfile_T *mfp, int flags)
if (os_char_avail()) { if (os_char_avail()) {
break; break;
} }
} else { } else if (!main_loop.recursive) { // May reach here on OOM in libuv callback
os_breakcheck(); os_breakcheck();
} }
if (got_int) { if (got_int) {