summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/io
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2020-10-09 17:53:53 +0200
committerFabian Kosmale <fabian.kosmale@qt.io>2020-10-13 08:06:18 +0200
commitb83225fcc3c6aa5655884cbf9e7391afe38b4392 (patch)
treec509ef650db260053d4d599a775e0ea267fbacf4 /tests/auto/corelib/io
parent9aa2be236f432dcf4e95a114aeb7254d78ca9dad (diff)
qDebug: Avoid implicit QVariant conversion
This commit restricts operator<<(QDebug lhs, QVariant rhs) to only work if rhs is actually of type QVariant (instead of any type convertible to QVariant). This is especially important as a) we check in QMetaType whether (slightly simplified) QDebug{} << std::declval<T>() is valid, and if so, register a function which simply uses the operator. b) In QVariant, we ask the metatype system for the contained types registered debug function and then use it. If a type now does not have its own operator<< for QDebug, but is implicitly convertible to QVariant containing itself, this would lead to an infinite recursion, when trying to use qDebug with that type. The registered function in a) would just convert the type to QVariant, and then ask the QVariant to print itself. Disallowing implicit conversions in qDebug in general was considered (i.e. adding template<typename T> operator<<(T) = delete in QDebug ), but discarded as it breaks too much code relying on conversions. Fixes: QTBUG-87122 Change-Id: Ib709297670cbc6cc307efd0dfd8e5b0279df9414 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/io')
-rw-r--r--tests/auto/corelib/io/qdebug/tst_qdebug.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
index 3dbda13643..949882b578 100644
--- a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
+++ b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
@@ -34,6 +34,7 @@
#include <QtConcurrentRun>
#include <QFutureSynchronizer>
+#include <QVariant>
static_assert(QTypeTraits::has_ostream_operator_v<QDebug, int>);
static_assert(QTypeTraits::has_ostream_operator_v<QDebug, QList<int>>);
@@ -42,6 +43,11 @@ struct NonStreamable {};
static_assert(!QTypeTraits::has_ostream_operator_v<QDebug, NonStreamable>);
static_assert(!QTypeTraits::has_ostream_operator_v<QDebug, QList<NonStreamable>>);
static_assert(!QTypeTraits::has_ostream_operator_v<QDebug, QMap<int, NonStreamable>>);
+struct ConvertsToQVariant {
+ operator QVariant() {return QVariant::fromValue(*this);};
+};
+static_assert(!QTypeTraits::has_ostream_operator_v<QDebug, ConvertsToQVariant>);
+
class tst_QDebug: public QObject
{
@@ -75,6 +81,7 @@ private slots:
void defaultMessagehandler() const;
void threadSafety() const;
void toString() const;
+ void noQVariantEndlessRecursion() const;
};
void tst_QDebug::assignment() const
@@ -770,6 +777,14 @@ void tst_QDebug::toString() const
}
}
+void tst_QDebug::noQVariantEndlessRecursion() const
+{
+ ConvertsToQVariant conv;
+ QVariant var = QVariant::fromValue(conv);
+ QTest::ignoreMessage(QtDebugMsg, "QVariant(ConvertsToQVariant, )");
+ qDebug() << var;
+}
+
// Should compile: instentiation of unrelated operator<< should not cause cause compilation
// error in QDebug operators (QTBUG-47375)
class TestClassA {};