aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-08-19 20:26:00 +0800
committerzeertzjq <zeertzjq@outlook.com>2022-08-19 20:39:17 +0800
commit4edf967050b0eadba4e0e2d8c0d069f8c8e4bc65 (patch)
treeff0082edd8ca18ec375ebe26a0b855982dd39cb2
parentaa96a80d5df98d7fa888bd80eb7e4721e9e039f9 (diff)
downloadrneovim-4edf967050b0eadba4e0e2d8c0d069f8c8e4bc65.tar.gz
rneovim-4edf967050b0eadba4e0e2d8c0d069f8c8e4bc65.tar.bz2
rneovim-4edf967050b0eadba4e0e2d8c0d069f8c8e4bc65.zip
vim-patch:9.0.0227: cannot read error message when abort() is called
Problem: Cannot read error message when abort() is called. Solution: Output a newline before calling abort(). https://github.com/vim/vim/commit/213e70e284b0975dd34525e94e59e26811097c72 Add emsg_not_now() check to make code equivalent.
-rw-r--r--src/nvim/message.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c
index 67b15e3e7d..684cf7207c 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -837,6 +837,8 @@ void iemsg(const char *s)
emsg(s);
#ifdef ABORT_ON_INTERNAL_ERROR
set_vim_var_string(VV_ERRMSG, s, -1);
+ msg_putchar('\n'); // avoid overwriting the error message
+ ui_flush();
abort();
#endif
}
@@ -846,11 +848,17 @@ void iemsg(const char *s)
/// detected when fuzzing vim.
void siemsg(const char *s, ...)
{
+ if (emsg_not_now()) {
+ return;
+ }
+
va_list ap;
va_start(ap, s);
(void)semsgv(s, ap);
va_end(ap);
#ifdef ABORT_ON_INTERNAL_ERROR
+ msg_putchar('\n'); // avoid overwriting the error message
+ ui_flush();
abort();
#endif
}