From 284016c7e61ded0e3145b6f3e96748ddc1853051 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 1 Apr 2016 23:25:51 +0200 Subject: network-settings.h: don't crash when running without the test server Don't access first() of a potentially-empty QList. Check for QHostInfo::error() first. Also change to constFirst() to prevent a detach. Change-Id: I91fa0bbfb21f62af29abdb23b4869a7f039b259e Reviewed-by: Lars Knoll --- tests/auto/network-settings.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 0e8cfd759e..a90ea62277 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -71,7 +71,12 @@ public: #ifdef QT_NETWORK_LIB static QHostAddress serverIP() { - return QHostInfo::fromName(serverName()).addresses().first(); + const QHostInfo info = QHostInfo::fromName(serverName()); + if (info.error()) { + QTest::qFail(qPrintable(info.errorString()), __FILE__, __LINE__); + return QHostAddress(); + } + return info.addresses().constFirst(); } #endif -- cgit v1.2.3