diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-05-06 14:47:31 +0200 |
---|---|---|
committer | Cherry-pick Bot <cherrypickbot@codereview.qt-project.org> | 2020-05-06 14:42:02 +0000 |
commit | 6e65714cac98c2d355c06c10d355e82cfb07aa4b (patch) | |
tree | eb229f41e6321d8e3320062e16d772462d7bfaea | |
parent | c7755a190ec9484ff97804de75d484e0a1d20cef (diff) |
Plug memory leak when returning prematurely
Use QScopedPointer, like elsewhere in the code.
Fixes: QTBUG-83984
Change-Id: I6006b4c7f5ba6dfd0f4eccea2b6e9227cbf3a02c
Coverity-Id: 21962
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit c260c31a441ebae149fccad6d0a9dde68c57b4eb)
Reviewed-by: Cherry-pick Bot
-rw-r--r-- | src/designer/src/lib/shared/widgetdatabase.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/designer/src/lib/shared/widgetdatabase.cpp b/src/designer/src/lib/shared/widgetdatabase.cpp index 6b63ac7b4..8621f2840 100644 --- a/src/designer/src/lib/shared/widgetdatabase.cpp +++ b/src/designer/src/lib/shared/widgetdatabase.cpp @@ -643,7 +643,7 @@ QString WidgetDataBase::formTemplate(const QDesignerFormEditorInterface *core, c // Set a fixed size on a XML template QString WidgetDataBase::scaleFormTemplate(const QString &xml, const QSize &size, bool fixed) { - DomUI *domUI = QDesignerWidgetBox::xmlToUi(QStringLiteral("Form"), xml, false); + QScopedPointer<DomUI> domUI(QDesignerWidgetBox::xmlToUi(QStringLiteral("Form"), xml, false)); if (!domUI) return QString(); DomWidget *domWidget = domUI->elementWidget(); @@ -721,7 +721,6 @@ QString WidgetDataBase::scaleFormTemplate(const QString &xml, const QSize &size, writer.writeEndDocument(); } - delete domUI; return rc; } |