From 404e213cc4c65fac387a4d71a5e4cb6270f3fe7d Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 23 Jan 2018 13:57:56 +0100 Subject: [PATCH] Log an error and abort sending chat message without any content --- src/chat/chat-message/chat-message.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/chat/chat-message/chat-message.cpp b/src/chat/chat-message/chat-message.cpp index 748fd3ccc..2e69618dc 100644 --- a/src/chat/chat-message/chat-message.cpp +++ b/src/chat/chat-message/chat-message.cpp @@ -593,8 +593,14 @@ void ChatMessagePrivate::send () { // End of message modification // --------------------------------------- - if (internalContent.isEmpty()) - internalContent = *(contents.front()); + if (internalContent.isEmpty()) { + if (contents.size() > 0) { + internalContent = *(contents.front()); + } else { + lError() << "Trying to send a message without any content !"; + return; + } + } auto msgOp = dynamic_cast(op); if (internalContent.getContentType().isValid()) {