diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-06-16 14:17:13 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-06-16 14:17:13 (GMT) |
| commit | afd45f48c2c87196f4f18256bfb326aa076af4d6 (patch) | |
| tree | fe25558ef93f4204deb1365ffb0a4bf12fe59fa8 /src | |
| parent | 91c544615cfd8b570e26dacbd9711b4d0a4aac9a (diff) | |
| parent | d0fd99c717af43bbebd8dda88c97ca4b7ea4b559 (diff) | |
| download | Qt-afd45f48c2c87196f4f18256bfb326aa076af4d6.zip Qt-afd45f48c2c87196f4f18256bfb326aa076af4d6.tar.gz Qt-afd45f48c2c87196f4f18256bfb326aa076af4d6.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/kernel/qhostinfo_unix.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp index f5d7166..bdbf986 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp @@ -320,8 +320,7 @@ QString QHostInfo::localDomainName() if (local_res_ninit) { // using thread-safe version res_state_ptr state = res_state_ptr(qMalloc(sizeof(*state))); - if (!state) - qBadAlloc(); + Q_CHECK_PTR(state); memset(state, 0, sizeof(*state)); local_res_ninit(state); QString domainName = QUrl::fromAce(state->defdname); |