summaryrefslogtreecommitdiffstats
path: root/tests/auto/dbus
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-10-04 19:49:58 +0200
committerMarc Mutz <marc.mutz@kdab.com>2017-01-26 10:33:28 +0000
commit940d667eb41958de120ee759323c67bd7385af0d (patch)
treedc1b9f2da272616ad1a86481f0cbf9cf356e1f5e /tests/auto/dbus
parente15cb86b3bc2cb1ed777a741f4b9e23fdb829249 (diff)
Plug leaks in tests/auto/dbus
In tst_QDBusMetaObject::types(), hold a QMetaObject obtained from QDBusMetaObject::createMetaObject() in a QScopedPointer instead of leaking it. Use correct return value type. This fixes the remaining errors in GCC 6.1 Linux ASan runs of tests/auto/dbus. Change-Id: I1df7f8e42d45f40ecf381fe7b684a8ab5ebee675 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/dbus')
-rw-r--r--tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp
index cb1c9401ba..a4afae4b46 100644
--- a/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp
+++ b/tests/auto/dbus/qdbusmetaobject/tst_qdbusmetaobject.cpp
@@ -370,8 +370,7 @@ void tst_QDBusMetaObject::types()
QDBusError error;
- QMetaObject *result = QDBusMetaObject::createMetaObject("local.Interface", xml,
- map, error);
+ const QScopedPointer<QDBusMetaObject> result(QDBusMetaObject::createMetaObject("local.Interface", xml, map, error));
QVERIFY2(result, qPrintable(error.message()));
QCOMPARE(result->enumeratorCount(), 0);