From d1a95888d6c868cdb4a064dfe4581ccf33bd92fa Mon Sep 17 00:00:00 2001 From: Jonah Brüchert Date: Thu, 9 Mar 2023 17:19:21 +0100 Subject: Fix missing exports with MSVC 2019 Fixes the Kaidan build with MSVC. Weirdly enough, MSVC got confused on finding the matching overload for <<, so I replaced it with push_back(). --- src/client/QXmppMamManager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/client') diff --git a/src/client/QXmppMamManager.h b/src/client/QXmppMamManager.h index 71cb4311..548d56d6 100644 --- a/src/client/QXmppMamManager.h +++ b/src/client/QXmppMamManager.h @@ -40,7 +40,7 @@ class QXMPP_EXPORT QXmppMamManager : public QXmppClientExtension Q_OBJECT public: - struct RetrievedMessages + struct QXMPP_EXPORT RetrievedMessages { QXmppMamResultIq result; QVector messages; -- cgit v1.2.3 From 2d232b7720fe356fa5d74d38a4242440403aba7a Mon Sep 17 00:00:00 2001 From: Jonah Brüchert Date: Sat, 18 Mar 2023 19:34:40 +0100 Subject: MamManager: Fix crash when reading .size() from a deleted QVector --- src/client/QXmppMamManager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/client') diff --git a/src/client/QXmppMamManager.cpp b/src/client/QXmppMamManager.cpp index fe0735c7..046f01b0 100644 --- a/src/client/QXmppMamManager.cpp +++ b/src/client/QXmppMamManager.cpp @@ -339,7 +339,8 @@ QXmppTask QXmppMamManager::retrieveMessages(con // because some decryptMessage() jobs could finish instantly state.runningDecryptionJobs = encryptedCount; - for (auto i = 0; i < state.messages.size(); i++) { + int size = state.messages.size(); + for (auto i = 0; i < size; i++) { if (!messagesEncrypted[i]) { continue; } -- cgit v1.2.3