From d76b2fbe30a503009d33c4df06848d7356fc39a6 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Tue, 3 Apr 2018 18:32:14 +0900 Subject: DirectChatEvent: be careful with range-for over temporaries ...because temporaries returned by temporaries tend to disappear before you enter the loop body (see the bottom of http://en.cppreference.com/w/cpp/language/range-for#Explanation). --- lib/connection.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'lib/connection.cpp') diff --git a/lib/connection.cpp b/lib/connection.cpp index 9d0a34f3..71ada8f7 100644 --- a/lib/connection.cpp +++ b/lib/connection.cpp @@ -281,8 +281,7 @@ void Connection::sync(int timeout) void Connection::onSyncSuccess(SyncData &&data) { d->data->setLastEvent(data.nextBatch()); - auto allRoomData = data.takeRoomData(); - for (auto&& roomData: allRoomData) + for (auto&& roomData: data.takeRoomData()) { const auto forgetIdx = d->roomIdsToForget.indexOf(roomData.roomId); if (forgetIdx != -1) @@ -303,12 +302,7 @@ void Connection::onSyncSuccess(SyncData &&data) { r->updateData(std::move(roomData)); QCoreApplication::processEvents(); } - // `for (auto&& accountEvent: data.takeAccountData())` doesn't work well - // with Clang on FreeBSD in Release configuration; it seems that - // the lifetime of the returned rvalue does not extend (violating the - // standard) and accountEvent refers to garbage in the loop body as a result. - auto allAccountData = data.takeAccountData(); - for (auto&& accountEvent: allAccountData) + for (auto&& accountEvent: data.takeAccountData()) { if (accountEvent->type() == EventType::DirectChat) { -- cgit v1.2.3