Avoid adding widget to its own layout

Widgets and layouts added or inserted to a layout are checked for:
- Not being NULL
- Not being the parent widget of a layout or the layout itself,
  respectively

Without this commit, adding a widget to its own layout would result in a
CPU-hogging infinite loop. Now, a warning is written to stderr and the
add or insert function call is ignored.

The checks are implemented as public functions of QLayoutPrivate and
thus accessible in QLayout's descendants to be used in various
"addWidget", "insertWidget", etc functions.

Unlike 'classical' layouts like QGridLayout, QFormLayout does indeed
accept widgets that are NULL. To not break this behavior, any call for
the check functions first tests if the widget or layout, respectively,
to test is NULL or not and calls the check only in the latter case.

Automated tests for QBoxLayout, QGridLayout, and QFormLayout were added.
For an unpatched Qt 5.3, each of those automated tests will freeze as
explained in QTBUG-40609. For a fixed version, warning messages about
invalid parameters to addWidget/addLayout/... calls will be read by
QTest::ignoreMessage, resulting in a passed test.

Change-Id: I1522d5727e643da3f7c025755975aca9f482676d
Task-number: QTBUG-40609
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

1 files changed, 14 insertions, 8 deletions

diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp
index 239e1ce1e2..9f545b858a 100644
--- a/src/widgets/kernel/qformlayout.cpp
+++ b/src/widgets/kernel/qformlayout.cpp
@@ -1280,6 +1280,8 @@ void QFormLayout::addRow(QLayout *layout)
 void QFormLayout::insertRow(int row, QWidget *label, QWidget *field)
 {
     Q_D(QFormLayout);
+    if ((label && !d->checkWidget(label)) || (field && !d->checkWidget(field)))
+        return;
 
     row = d->insertRow(row);
     if (label)
@@ -1295,6 +1297,8 @@ void QFormLayout::insertRow(int row, QWidget *label, QWidget *field)
 void QFormLayout::insertRow(int row, QWidget *label, QLayout *field)
 {
     Q_D(QFormLayout);
+    if ((label && !d->checkWidget(label)) || (field && !d->checkLayout(field)))
+        return;
 
     row = d->insertRow(row);
     if (label)
@@ -1313,6 +1317,10 @@ void QFormLayout::insertRow(int row, QWidget *label, QLayout *field)
 */
 void QFormLayout::insertRow(int row, const QString &labelText, QWidget *field)
 {
+    Q_D(QFormLayout);
+    if (field && !d->checkWidget(field))
+        return;
+
     QLabel *label = 0;
     if (!labelText.isEmpty()) {
         label = new QLabel(labelText);
@@ -1331,6 +1339,10 @@ void QFormLayout::insertRow(int row, const QString &labelText, QWidget *field)
 */
 void QFormLayout::insertRow(int row, const QString &labelText, QLayout *field)
 {
+    Q_D(QFormLayout);
+    if (field && !d->checkLayout(field))
+        return;
+
     insertRow(row, labelText.isEmpty() ? 0 : new QLabel(labelText), field);
 }
 
@@ -1344,11 +1356,8 @@ void QFormLayout::insertRow(int row, const QString &labelText, QLayout *field)
 void QFormLayout::insertRow(int row, QWidget *widget)
 {
     Q_D(QFormLayout);
-
-    if (!widget) {
-        qWarning("QFormLayout: Cannot add null field to %s", qPrintable(objectName()));
+    if (!d->checkWidget(widget))
         return;
-    }
 
     row = d->insertRow(row);
     d->setWidget(row, SpanningRole, widget);
@@ -1365,11 +1374,8 @@ void QFormLayout::insertRow(int row, QWidget *widget)
 void QFormLayout::insertRow(int row, QLayout *layout)
 {
     Q_D(QFormLayout);
-
-    if (!layout) {
-        qWarning("QFormLayout: Cannot add null field to %s", qPrintable(objectName()));
+    if (!d->checkLayout(layout))
         return;
-    }
 
     row = d->insertRow(row);
     d->setLayout(row, SpanningRole, layout);