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

vim-patch:8.2.2163: crash when discarded exception is the current exception

Browse Source 
Problem:    Crash when discarded exception is the current exception.
Solution:   Compare the execption with current_exception. (closes vim/vim#7499)
13656f02e4
This commit is contained in:
Jan Edmund Lazo
2020-12-19 21:31:23 -05:00
parent 6ee8964d46
commit e465157ecd
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/nvim/ex_eval.c
View File

@@ -518,10 +518,13 @@ fail:
* Discard an exception. "was_finished" is set when the exception has been * Discard an exception. "was_finished" is set when the exception has been
* caught and the catch clause has been ended normally. * caught and the catch clause has been ended normally.
*/ */
static void discard_exception(except_T *excp, int was_finished) static void discard_exception(except_T *excp, bool was_finished)
{ {
char_u *saved_IObuff; char_u *saved_IObuff;
if (current_exception == excp) {
current_exception = NULL;
}
if (excp == NULL) { if (excp == NULL) {
internal_error("discard_exception()"); internal_error("discard_exception()");
return; return;
@@ -569,7 +572,6 @@ void discard_current_exception(void)
{ {
if (current_exception != NULL) { if (current_exception != NULL) {
discard_exception(current_exception, false); discard_exception(current_exception, false);
current_exception = NULL;
} }
// Note: all globals manipulated here should be saved/restored in // Note: all globals manipulated here should be saved/restored in
// try_enter/try_leave. // try_enter/try_leave.
@@ -652,8 +654,8 @@ static void finish_exception(except_T *excp)
set_vim_var_string(VV_THROWPOINT, NULL, -1); set_vim_var_string(VV_THROWPOINT, NULL, -1);
} }
/* Discard the exception, but use the finish message for 'verbose'. */ // Discard the exception, but use the finish message for 'verbose'.
discard_exception(excp, TRUE); discard_exception(excp, true);
} }
/* /*
@@ -1812,11 +1814,12 @@ void leave_cleanup(cleanup_T *csp)
* made pending by it. Report this to the user if required by the * made pending by it. Report this to the user if required by the
* 'verbose' option or when debugging. */ * 'verbose' option or when debugging. */
if (aborting() || need_rethrow) { if (aborting() || need_rethrow) {
if (pending & CSTP_THROW) if (pending & CSTP_THROW) {
/* Cancel the pending exception (includes report). */ // Cancel the pending exception (includes report).
discard_exception(csp->exception, FALSE); discard_exception(csp->exception, false);
else } else {
report_discard_pending(pending, NULL); report_discard_pending(pending, NULL);
}
/* If an error was about to be converted to an exception when /* If an error was about to be converted to an exception when
* enter_cleanup() was called, free the message list. */ * enter_cleanup() was called, free the message list. */
@@ -1916,15 +1919,13 @@ int cleanup_conditionals(cstack_T *cstack, int searched_cond, int inclusive)
default: default:
if (cstack->cs_flags[idx] & CSF_FINALLY) { if (cstack->cs_flags[idx] & CSF_FINALLY) {
if (cstack->cs_pending[idx] & CSTP_THROW) { if (cstack->cs_pending[idx] & CSTP_THROW) {
/* Cancel the pending exception. This is in the // Cancel the pending exception. This is in the
* finally clause, so that the stack of the // finally clause, so that the stack of the
* caught exceptions is not involved. */ // caught exceptions is not involved.
discard_exception((except_T *) discard_exception((except_T *)cstack->cs_exception[idx], false);
cstack->cs_exception[idx], } else {
FALSE); report_discard_pending(cstack->cs_pending[idx], NULL);
} else }
report_discard_pending(cstack->cs_pending[idx],
NULL);
cstack->cs_pending[idx] = CSTP_NONE; cstack->cs_pending[idx] = CSTP_NONE;
} }
break; break;