feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix double deletion of rewriter actions

Browse Source 
Actions were deleted after being inserted into actionsToRemove,
which caused them to get deleted again, leading to crash.

Change-Id: If6597f117859ca92cfc5af67c730e2f84e5c0639
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Miikka Heikkinen
2024-05-21 11:40:30 +03:00
parent 46350083de
commit 872c4bf092
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
View File

@@ -58,7 +58,6 @@ void RewriteActionCompressor::compressImports(QList<RewriteAction *> &actions) c
actionsToRemove.append(action); actionsToRemove.append(action);
actionsToRemove.append(addImportAction); actionsToRemove.append(addImportAction);
addedImports.remove(import); addedImports.remove(import);
delete addImportAction;
} else { } else {
removedImports.insert(import, action); removedImports.insert(import, action);
} }
@@ -67,13 +66,11 @@ void RewriteActionCompressor::compressImports(QList<RewriteAction *> &actions) c
if (RewriteAction *duplicateAction = addedImports.value(import, 0)) { if (RewriteAction *duplicateAction = addedImports.value(import, 0)) {
actionsToRemove.append(duplicateAction); actionsToRemove.append(duplicateAction);
addedImports.remove(import); addedImports.remove(import);
delete duplicateAction;
addedImports.insert(import, action); addedImports.insert(import, action);
} else if (RewriteAction *removeAction = removedImports.value(import, 0)) { } else if (RewriteAction *removeAction = removedImports.value(import, 0)) {
actionsToRemove.append(action); actionsToRemove.append(action);
actionsToRemove.append(removeAction); actionsToRemove.append(removeAction);
removedImports.remove(import); removedImports.remove(import);
delete removeAction;
} else { } else {
addedImports.insert(import, action); addedImports.insert(import, action);
} }