Merge pull request #388 from scratchcpp/fix_vm_stopping_clearing_arguments

Fix #387: Do not clear procedure arguments when stopping the VM

Author: adazem009

src/engine/virtualmachine_p.cpp

@@ -731,10 +731,6 @@ do_exec : {
     }
     if (stop) {
         stop = false;
-        callTree.clear();
-        procedureArgTree.clear();
-        procedureArgs = nullptr;
-        nextProcedureArgs = nullptr;
         if (goBack) {
             goBack = false;
             pos -= instruction_arg_count[OP_EXEC] + 1;

test/virtual_machine/virtual_machine_test.cpp

@@ -1687,3 +1687,31 @@ TEST(VirtualMachineTest, NoCrashInNestedLoopsInIfElseStatements)
     vm.run();
     ASSERT_EQ(vm.registerCount(), 0);
 }
+
+TEST(VirtualMachineTest, NoCrashWhenReadingProcedureArgsAfterStopping)
+{
+    // Regtest for #387
+    static unsigned int bytecode[] = { OP_START, OP_INIT_PROCEDURE, OP_CONST, 0, OP_ADD_ARG, OP_CALL_PROCEDURE, 0, OP_HALT };
+    static unsigned int procedure[] = { OP_START, OP_NULL, OP_EXEC, 0, OP_READ_ARG, 0, OP_PRINT, OP_HALT };
+    static unsigned int *procedures[] = { procedure };
+    static BlockFunc functions[] = { &testFunction3 };
+    static Value constValues[] = { "test" };
+
+    VirtualMachine vm(nullptr, nullptr, nullptr);
+    vm.setBytecode(bytecode);
+    vm.setProcedures(procedures);
+    vm.setFunctions(functions);
+    vm.setConstValues(constValues);
+
+    testing::internal::CaptureStdout();
+    vm.run();
+    ASSERT_TRUE(testing::internal::GetCapturedStdout().empty());
+    ASSERT_EQ(vm.registerCount(), 0);
+    ASSERT_FALSE(vm.atEnd());
+
+    testing::internal::CaptureStdout();
+    vm.run();
+    ASSERT_EQ(testing::internal::GetCapturedStdout(), "test\n");
+    ASSERT_EQ(vm.registerCount(), 0);
+    ASSERT_TRUE(vm.atEnd());
+}