From 2d97f5ded964512c87d56259a18f461a59b15622 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 1 Feb 2018 15:40:01 +0100 Subject: [PATCH] Fix iterator bug in send() method of ChatMessagePrivate. --- src/chat/chat-message/chat-message.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chat/chat-message/chat-message.cpp b/src/chat/chat-message/chat-message.cpp index dc09421ae..09bd476e0 100644 --- a/src/chat/chat-message/chat-message.cpp +++ b/src/chat/chat-message/chat-message.cpp @@ -663,16 +663,16 @@ void ChatMessagePrivate::send () { } // Restore FileContents and remove FileTransferContents - list::iterator i = contents.begin(); - while (i != contents.end()) { - Content *content = *i; + list::iterator it = contents.begin(); + while (it != contents.end()) { + Content *content = *it; if (content->getContentType() == ContentType::FileTransfer) { FileTransferContent *fileTransferContent = (FileTransferContent *)content; - contents.erase(i++); + it = contents.erase(it); q->addContent(*fileTransferContent->getFileContent()); delete fileTransferContent; } else { - ++i; + it++; } }