From 80c6505eee7e8222dd194b9f44723b9c122fc98b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 23 Nov 2018 09:34:38 +0100 Subject: [PATCH] - fixed initialization of default parameters in dynamically created function calls like in the MENUDEF parser --- src/scripting/vm/vmframe.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/scripting/vm/vmframe.cpp b/src/scripting/vm/vmframe.cpp index e912cdad03..fd2a41f9f5 100644 --- a/src/scripting/vm/vmframe.cpp +++ b/src/scripting/vm/vmframe.cpp @@ -633,7 +633,10 @@ int VMCallWithDefaults(VMFunction *func, TArray ¶ms, VMReturn *resu { auto oldp = params.Size(); params.Resize(func->DefaultArgs.Size()); - memcpy(¶ms[oldp], &func->DefaultArgs[oldp], (params.Size() - oldp) * sizeof(VMValue)); + for (unsigned i = oldp; i < params.Size(); i++) + { + params[i] = func->DefaultArgs[i]; + } } return VMCall(func, params.Data(), params.Size(), results, numresults); }