diff options
| author | Linus Jahn <lnj@kaidan.im> | 2019-10-14 22:34:22 +0200 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2019-10-14 22:34:22 +0200 |
| commit | b1cd9bb4547a1120b19d4e996afba0f39c041d22 (patch) | |
| tree | 97e43843f47e29fe4910224a9878ed98add92861 | |
| parent | f95db9d35fe8ef0ed025552043f1582db9c0834d (diff) | |
| parent | 4ef390c2958ba6c498e529b3ba948ab1ef094454 (diff) | |
| download | qxmpp-b1cd9bb4547a1120b19d4e996afba0f39c041d22.tar.gz | |
Merge remote-tracking branch 'origin/stable'
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | src/client/QXmppOutgoingClient.cpp | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 46899c88..d6dce3a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -QXmpp 1.0.1 (UNRELEASED) +QXmpp 1.1.0 (UNRELEASED) ------------------------ New features: @@ -9,6 +9,13 @@ New features: - Add XEP-0380: Explicit Message Encryption (v0.3.0) (#199, @lnjX) - Add XEP-0382: Spoiler messages (v0.2.0) (#195, @lnjX) +QXmpp 1.0.1 (Oct 14, 2019) +-------------------------- + + - Fix potential SEGFAULT on connection error (#216, @0xd34df00d) + - Fix SO_VERSION to 1: ABI has changed since last minor release (#185, @tehnick) + - Add CMake option for internal tests (BUILD_INTERNAL_TESTS) (#184, @jlaine) + QXmpp 1.0.0 (Jan 8, 2019) ------------------------- diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp index f7eb8099..3e8b4034 100644 --- a/src/client/QXmppOutgoingClient.cpp +++ b/src/client/QXmppOutgoingClient.cpp @@ -169,11 +169,10 @@ void QXmppOutgoingClientPrivate::connectToHost(const QString &host, quint16 port void QXmppOutgoingClientPrivate::connectToNextDNSHost() { + auto curIdx = nextSrvRecordIdx++; connectToHost( - dns.serviceRecords().at(nextSrvRecordIdx).target(), - dns.serviceRecords().at(nextSrvRecordIdx).port()); - - nextSrvRecordIdx++; + dns.serviceRecords().at(curIdx).target(), + dns.serviceRecords().at(curIdx).port()); } /// Constructs an outgoing client stream. |