Return can break loop execution as well. If it does, it needs to ensure VM_FRAME_ACTIVE is on top.

2019-12-22 22:40:11 +01:00
parent c730082fa0
commit 709b5971c6
1 changed files with 6 additions and 0 deletions
--- a/engine/vm.c
+++ b/engine/vm.c
@@ -1901,6 +1901,12 @@ static sxi32 VmByteCodeExec(
 					if(pLastRef) {
 						*pLastRef = pTos->nIdx;
 					}
+					/* Ensure we are in active loop. Force abort all loops */
+					if(pVm->pFrame->iFlags & VM_FRAME_LOOP) {
+						while((pVm->pFrame->iFlags & VM_FRAME_ACTIVE) == 0) {
+							VmLeaveFrame(&(*pVm));
+						}
+					}
 					if(pResult) {
 						/* Execution result */
 						PH7_MemObjStore(pTos, pResult);