Merge pull request #1114 from iakov/fix/memleak_commands

Fix memory access issues

Author: iakov

plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp

@@ -558,7 +558,7 @@ QList<AbstractItem *> TwoDModelWidget::selectedColorItems() const
 
 void TwoDModelWidget::onSelectionChange()
 {
-	if (mScene->oneRobot()) {
+	if (!mScene || mScene->oneRobot()) {
 		return;
 	}
 

qrgui/controller/commands/abstractCommand.cpp

@@ -20,19 +20,14 @@
 using namespace qReal::commands;
 
 AbstractCommand::AbstractCommand()
-	: mExecuted(false), mRedoEnabled(true), mUndoEnabled(true)
 {
 	mTimestamp = QDateTime::currentMSecsSinceEpoch();
 }
 
 AbstractCommand::~AbstractCommand()
 {
-	for (AbstractCommand *command : mPreActions) {
-		delete command;
-	}
-	for (AbstractCommand *command : mPostActions) {
-		delete command;
-	}
+	qDeleteAll(mPreActions);
+	qDeleteAll(mPostActions);
 }
 
 void AbstractCommand::redo()

qrgui/controller/commands/abstractCommand.h

@@ -92,13 +92,13 @@ class QRGUI_CONTROLLER_EXPORT AbstractCommand : public QObject, public QUndoComm
 
 	void removeDuplicatesOn(QList<AbstractCommand *> &list);
 
-	bool mExecuted;
-	bool mRedoEnabled;
-	bool mUndoEnabled;
-	QList<AbstractCommand *> mPreActions;
-	QList<AbstractCommand *> mPostActions;
+	bool mExecuted { false };
+	bool mRedoEnabled { true };
+	bool mUndoEnabled { true };
+	QList<AbstractCommand *> mPreActions; // has ownership
+	QList<AbstractCommand *> mPostActions; // has ownership
 	QString mModuleBinded;
-	uint mTimestamp;
+	uint mTimestamp {};
 };
 
 inline bool operator==(const AbstractCommand &c1, const AbstractCommand &c2)

qrgui/editor/nodeElement.cpp

@@ -626,8 +626,6 @@ void NodeElement::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 	}
 
 	EditorViewScene *evScene = dynamic_cast<EditorViewScene *>(scene());
-	commands::InsertIntoEdgeCommand *insertCommand = new commands::InsertIntoEdgeCommand(
-			*evScene, mModels, id(), id(), Id::rootId(), event->scenePos(), boundingRect().bottomRight(), false);
 
 	bool shouldProcessResize = true;
 
@@ -677,6 +675,8 @@ void NodeElement::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 	}
 
 	if (shouldProcessResize && mResizeCommand) {
+		auto *insertCommand = new commands::InsertIntoEdgeCommand(
+				*evScene, mModels, id(), id(), Id::rootId(), event->scenePos(), boundingRect().bottomRight(), false);
 		mResizeCommand->addPostAction(insertCommand);
 		endResize();
 	}