asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix UndoRedo::create_action() invalid memory usage

Browse source 
(cherry picked from commit b00b7f9b7c)
This commit is contained in:
Haoyu Qiu 2022-03-01 17:59:37 +08:00 committed by Rémi Verschelde
parent e3cd47f6cc
commit 56fd92ca76
2 changed files with 19 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
core/undo_redo.cpp
View file

@ -33,6 +33,20 @@
#include "core/os/os.h"
#include "core/resource.h"
void UndoRedo::Operation::delete_reference() {
if (type != Operation::TYPE_REFERENCE) {
return;
}
if (ref.is_valid()) {
ref.unref();
} else {
Object *obj = ObjectDB::get_instance(object);
if (obj) {
memdelete(obj);
}
}
}
void UndoRedo::_discard_redo() {
if (current_action == actions.size() - 1) {
return;
@ -40,16 +54,7 @@ void UndoRedo::_discard_redo() {
for (int i = current_action + 1; i < actions.size(); i++) {
for (List<Operation>::Element *E = actions.write[i].do_ops.front(); E; E = E->next()) {
if (E->get().type == Operation::TYPE_REFERENCE) {
if (E->get().ref.is_valid()) {
E->get().ref.unref();
} else {
Object *obj = ObjectDB::get_instance(E->get().object);
if (obj) {
memdelete(obj);
}
}
}
E->get().delete_reference();
}
//ERASE do data
}
@ -72,14 +77,7 @@ void UndoRedo::create_action(const String &p_name, MergeMode p_mode) {
List<Operation>::Element *E = actions.write[current_action + 1].do_ops.front();
while (E) {
if (E->get().type == Operation::TYPE_REFERENCE) {
Object *obj = ObjectDB::get_instance(E->get().object);
if (obj) {
memdelete(obj);
}
}
E->get().delete_reference();
E = E->next();
actions.write[current_action + 1].do_ops.pop_front();
}
@ -224,16 +222,7 @@ void UndoRedo::_pop_history_tail() {
}
for (List<Operation>::Element *E = actions.write[0].undo_ops.front(); E; E = E->next()) {
if (E->get().type == Operation::TYPE_REFERENCE) {
if (E->get().ref.is_valid()) {
E->get().ref.unref();
} else {
Object *obj = ObjectDB::get_instance(E->get().object);
if (obj) {
memdelete(obj);
}
}
}
E->get().delete_reference();
}
actions.remove(0);

2
core/undo_redo.h
View file

@ -64,6 +64,8 @@ private:
ObjectID object;
String name;
Variant args[VARIANT_ARG_MAX];
void delete_reference();
};
struct Action {