diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-04-01 23:25:51 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-04-05 06:52:39 +0000 |
| commit | 284016c7e61ded0e3145b6f3e96748ddc1853051 (patch) | |
| tree | 00a4abea8a1a9f985db7097c4a930fb8bccf748d /tests | |
| parent | b5eb553bf3bd6b9aad79241a65b9bebb40a848fd (diff) | |
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 <lars.knoll@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/network-settings.h | 7 |
1 files changed, 6 insertions, 1 deletions
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 |