berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

scripting engine: fix T_IF_ERR bug where T_POP never occurs if else branch exits early

This commit is contained in:
nakst 2022-03-02 08:43:34 +00:00
parent 28a680f8fc
commit 9a39866607
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util/script.c
View File

@ -3711,12 +3711,13 @@ bool FunctionBuilderRecurse(Tokenizer *tokenizer, Node *node, FunctionBuilder *b
int32_t delta = builder->dataBytes - writeOffset; int32_t delta = builder->dataBytes - writeOffset;
MemoryCopy(builder->data + writeOffset, &delta, sizeof(delta)); MemoryCopy(builder->data + writeOffset, &delta, sizeof(delta));
b = T_POP;
FunctionBuilderAppend(builder, &b, sizeof(b));
if (node->firstChild->sibling->sibling->sibling) { if (node->firstChild->sibling->sibling->sibling) {
if (!FunctionBuilderRecurse(tokenizer, node->firstChild->sibling->sibling->sibling, builder, false)) return false; if (!FunctionBuilderRecurse(tokenizer, node->firstChild->sibling->sibling->sibling, builder, false)) return false;
} }
b = T_POP;
FunctionBuilderAppend(builder, &b, sizeof(b));
delta = builder->dataBytes - writeOffsetElse; delta = builder->dataBytes - writeOffsetElse;
MemoryCopy(builder->data + writeOffsetElse, &delta, sizeof(delta)); MemoryCopy(builder->data + writeOffsetElse, &delta, sizeof(delta));
@ -4365,7 +4366,7 @@ int ScriptExecuteFunction(uintptr_t instructionPointer, ExecutionContext *contex
while (true) { while (true) {
uint8_t command = functionData[instructionPointer++]; uint8_t command = functionData[instructionPointer++];
// PrintDebug("--> %d, %ld, %ld\n", command, instructionPointer - 1, context->c->id); PrintDebug("--> %d, %ld, %ld, %ld\n", command, instructionPointer - 1, context->c->id, context->c->stackPointer);
if (command == T_BLOCK || command == T_FUNCBODY) { if (command == T_BLOCK || command == T_FUNCBODY) {
uint16_t newVariableCount = functionData[instructionPointer + 0] + (functionData[instructionPointer + 1] << 8); uint16_t newVariableCount = functionData[instructionPointer + 0] + (functionData[instructionPointer + 1] << 8);