Merge pull request #19843 from zeertzjq/vim-9.0.0227

vim-patch:8.2.3946,9.0.0227: internal error improvements
This commit is contained in:
zeertzjq 2022-08-19 21:02:38 +08:00 committed by GitHub
commit 7ff283b1b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions

View File

@ -830,8 +830,15 @@ static bool semsgv(const char *fmt, va_list ap)
/// detected when fuzzing vim.
void iemsg(const char *s)
{
if (emsg_not_now()) {
return;
}
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
}
@ -841,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
}

View File

@ -257,6 +257,7 @@ endfunc
func EarlyExit(test)
" It's OK for the test we use to test the quit detection.
if a:test != 'Test_zz_quit_detected()'
call add(v:errors, v:errmsg)
call add(v:errors, 'Test caused Vim to exit: ' . a:test)
endif