Merge "Protect against self-assignment, plug potential memory leak"

2021-03-01 11:31:11 +01:00 · 2021-03-01 11:31:11 +01:00 · a60f763f25
parent 3ae67b4434 3ae09debab
commit a60f763f25
1 changed files with 4 additions and 0 deletions
--- a/src/widgets/widgets/qdockarealayout.cpp
+++ b/src/widgets/widgets/qdockarealayout.cpp
@ -182,7 +182,11 @@ QSize QDockAreaLayoutItem::sizeHint() const
 QDockAreaLayoutItem
    &QDockAreaLayoutItem::operator = (const QDockAreaLayoutItem &other)
 {
+    if (this == &other)
+        return *this;
+
    widgetItem = other.widgetItem;
+    delete subinfo;
    if (other.subinfo == nullptr)
        subinfo = nullptr;
    else