1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't crash with null receiver/context in new-style connects

Browse Source 
old style connects have protection against null sender and null receiver,
but new style only had against null sender.

Change-Id: Ie555ac078412918e60c3b60830fe1f3abfb7f5af
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Sergio Martins 2017-12-13 21:29:21 +00:00 committed by Sérgio Martins
parent 77347a3699
commit 17d231039b
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qobject.cpp
View File

@ -4796,7 +4796,7 @@ QMetaObject::Connection QObjectPrivate::connectImpl(const QObject *sender, int s
QtPrivate::QSlotObjectBase *slotObj, Qt::ConnectionType type, QtPrivate::QSlotObjectBase *slotObj, Qt::ConnectionType type,
const int *types, const QMetaObject *senderMetaObject) const int *types, const QMetaObject *senderMetaObject)
{ {
if (!sender || !slotObj || !senderMetaObject) { if (!sender || !receiver || !slotObj || !senderMetaObject) {
qWarning("QObject::connect: invalid null parameter"); qWarning("QObject::connect: invalid null parameter");
if (slotObj) if (slotObj)
slotObj->destroyIfLastRef(); slotObj->destroyIfLastRef();

11
tests/auto/corelib/kernel/qobject/tst_qobject.cpp
View File

@ -150,6 +150,7 @@ private slots:
void deleteLaterInAboutToBlockHandler(); void deleteLaterInAboutToBlockHandler();
void mutableFunctor(); void mutableFunctor();
void checkArgumentsForNarrowing(); void checkArgumentsForNarrowing();
void nullReceiver();
}; };
struct QObjectCreatedOnShutdown struct QObjectCreatedOnShutdown
@ -7380,6 +7381,16 @@ void tst_QObject::checkArgumentsForNarrowing()
#undef FITS #undef FITS
} }
void tst_QObject::nullReceiver()
{
QObject o;
QObject *nullObj = nullptr; // Passing nullptr directly doesn't compile with gcc 4.8
QVERIFY(!connect(&o, &QObject::destroyed, nullObj, &QObject::deleteLater));
QVERIFY(!connect(&o, &QObject::destroyed, nullObj, [] {}));
QVERIFY(!connect(&o, &QObject::destroyed, nullObj, Functor_noexcept()));
QVERIFY(!connect(&o, SIGNAL(destroyed()), nullObj, SLOT(deleteLater())));
}
// Test for QtPrivate::HasQ_OBJECT_Macro // Test for QtPrivate::HasQ_OBJECT_Macro
Q_STATIC_ASSERT(QtPrivate::HasQ_OBJECT_Macro<tst_QObject>::Value); Q_STATIC_ASSERT(QtPrivate::HasQ_OBJECT_Macro<tst_QObject>::Value);
Q_STATIC_ASSERT(!QtPrivate::HasQ_OBJECT_Macro<SiblingDeleter>::Value); Q_STATIC_ASSERT(!QtPrivate::HasQ_OBJECT_Macro<SiblingDeleter>::Value);