mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 14:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3675 (#19766)

Browse Source 
vim-patch:8.2.3675: using freed memory when vim_strsave() fails

Problem:    Using freed memory when vim_strsave() fails.
Solution:   Clear "last_sourcing_name".  Check for msg_source() called
            recursively. (closes vim/vim#8217)
ba8c92687d

Although xstrdup() cannot fail in Nvim, it may still be possible that an
error appears (e.g. in regexp engine) when printing the message.
This commit is contained in:
zeertzjq
2022-08-14 15:15:43 +08:00
committed by GitHub
parent 5854103dad
commit c96020b2bf
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/message.c
View File

@@ -598,6 +598,14 @@ static char *get_emsg_lnum(void)
/// is only displayed if it changed. /// is only displayed if it changed.
void msg_source(int attr) void msg_source(int attr)
{ {
static bool recursive = false;
// Bail out if something called here causes an error.
if (recursive) {
return;
}
recursive = true;
no_wait_return++; no_wait_return++;
char *p = get_emsg_source(); char *p = get_emsg_source();
if (p != NULL) { if (p != NULL) {
@@ -613,14 +621,14 @@ void msg_source(int attr)
// remember the last sourcing name printed, also when it's empty // remember the last sourcing name printed, also when it's empty
if (SOURCING_NAME == NULL || other_sourcing_name()) { if (SOURCING_NAME == NULL || other_sourcing_name()) {
xfree(last_sourcing_name); XFREE_CLEAR(last_sourcing_name);
if (SOURCING_NAME == NULL) { if (SOURCING_NAME != NULL) {
last_sourcing_name = NULL;
} else {
last_sourcing_name = xstrdup(SOURCING_NAME); last_sourcing_name = xstrdup(SOURCING_NAME);
} }
} }
--no_wait_return; no_wait_return--;
recursive = false;
} }
/// @return TRUE if not giving error messages right now: /// @return TRUE if not giving error messages right now: