From ecf3410e996e7b07ac270e6900132a338a685b3a Mon Sep 17 00:00:00 2001 From: gambas Date: Wed, 7 Nov 2018 17:21:38 +0100 Subject: [PATCH] Fix a crash in exception management. [INTERPRETER] * BUG: Fix a crash in exception management. --- main/gbx/gbx_c_timer.c | 4 ++-- main/gbx/gbx_exec.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/gbx/gbx_c_timer.c b/main/gbx/gbx_c_timer.c index 895fb4418..2b2c19b3b 100644 --- a/main/gbx/gbx_c_timer.c +++ b/main/gbx/gbx_c_timer.c @@ -133,7 +133,7 @@ BEGIN_PROPERTY(Timer_Enabled) END_PROPERTY -BEGIN_PROPERTY(CTIMER_delay) +BEGIN_PROPERTY(Timer_Delay) if (READ_PROPERTY) GB_ReturnInteger(THIS->delay); @@ -184,7 +184,7 @@ GB_DESC NATIVE_Timer[] = GB_METHOD("_free", NULL, Timer_free, NULL), GB_PROPERTY("Enabled", "b", Timer_Enabled), - GB_PROPERTY("Delay", "i", CTIMER_delay), + GB_PROPERTY("Delay", "i", Timer_Delay), //GB_PROPERTY_READ("Timeout", "f", Timer_Timeout), GB_METHOD("Start", NULL, Timer_Start, NULL), diff --git a/main/gbx/gbx_exec.c b/main/gbx/gbx_exec.c index 274c3ed9d..dbc916e42 100644 --- a/main/gbx/gbx_exec.c +++ b/main/gbx/gbx_exec.c @@ -1021,7 +1021,7 @@ void EXEC_function_loop() EXEC_leave_drop(); ERROR_unlock(); - if (FP->fast) + if (FP && FP->fast) PROPAGATE(); // If we got the void stack frame, then we remove it and raise the error again