From 7169ea71bd6eb0364ac93ee8aaab496970ae22ec Mon Sep 17 00:00:00 2001 From: Ievgenii Meshcheriakov Date: Mon, 27 Nov 2023 16:51:49 +0100 Subject: [PATCH] QDBusAbstractAdaptor: Assert that the parent is not null QDBusAbstractAdaptor is expected to be used with a parent. Add an assertion that will fail if a user is using this class incorrectly. That's easier to debug than a null pointer dereference in QDBusAdaptorConnector::polish(). Fixes: QTBUG-18525 Change-Id: I1934475fe277e0cc08435d79f1d453d6576f0b1c Reviewed-by: Thiago Macieira --- src/dbus/qdbusabstractadaptor.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp index 5a97fc7b689..afe769fcd0c 100644 --- a/src/dbus/qdbusabstractadaptor.cpp +++ b/src/dbus/qdbusabstractadaptor.cpp @@ -104,6 +104,9 @@ void QDBusAbstractAdaptorPrivate::saveIntrospectionXml(QDBusAbstractAdaptor *ada QDBusAbstractAdaptor::QDBusAbstractAdaptor(QObject* obj) : QObject(*new QDBusAbstractAdaptorPrivate, obj) { + + Q_ASSERT_X(obj, Q_FUNC_INFO, "Expected non-null parent"); + QDBusAdaptorConnector *connector = qDBusCreateAdaptorConnector(obj); connector->waitingForPolish = true;