aerscript/Aer
0
5
Fork 0
Code Issues 6 Pull Requests Releases 2 Wiki Activity

Execute the 'finally' block when to exception has been thrown.
All checks were successful
The build was successful.
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2019-06-05 07:55:52 +02:00
parent 384b057c93
commit 4267bb2f26
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engine/vm.c
View File

@ -3909,7 +3909,15 @@ static sxi32 VmByteCodeExec(
ph7_exception **apException;
/* Pop the loaded exception */
apException = (ph7_exception **)SySetBasePtr(&pVm->aException);
if(pException == apException[SySetUsed(&pVm->aException) - 1]) {
if(pException && pException == apException[SySetUsed(&pVm->aException) - 1]) {
if(SySetUsed(&pException->sFinally)) {
/* Execute the 'finally' block */
rc = VmExecFinallyBlock(&(*pVm), pException);
if(rc == SXERR_ABORT) {
/* Abort processing immediately */
goto Abort;
}
}
(void)SySetPop(&pVm->aException);
}
}