From 09fa22002a843369e070eeedb590bbb51eb82bb7 Mon Sep 17 00:00:00 2001 From: "fuzzy@home" <70929713+komugi1211s@users.noreply.github.com> Date: Fri, 28 Apr 2023 22:00:24 +0900 Subject: [PATCH] fixes #76473, where filling a large amount of tiles all at once crashes the engine due to segmentation fault. --- core/object/undo_redo.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/core/object/undo_redo.cpp b/core/object/undo_redo.cpp index 17d9eaff0b8..f04961c7607 100644 --- a/core/object/undo_redo.cpp +++ b/core/object/undo_redo.cpp @@ -312,6 +312,11 @@ void UndoRedo::commit_action(bool p_execute) { } void UndoRedo::_process_operation_list(List::Element *E) { + const int PREALLOCATE_ARGS_COUNT = 16; + + LocalVector args; + args.reserve(PREALLOCATE_ARGS_COUNT); + for (; E; E = E->next()) { Operation &op = E->get(); @@ -347,12 +352,13 @@ void UndoRedo::_process_operation_list(List::Element *E) { if (binds.is_empty()) { method_callback(method_callback_ud, obj, op.name, nullptr, 0); } else { - const Variant **args = (const Variant **)alloca(sizeof(const Variant **) * binds.size()); + args.clear(); + for (int i = 0; i < binds.size(); i++) { - args[i] = (const Variant *)&binds[i]; + args.push_back(&binds[i]); } - method_callback(method_callback_ud, obj, op.name, args, binds.size()); + method_callback(method_callback_ud, obj, op.name, args.ptr(), binds.size()); } } } break;