From 0049b3e32d1d65acb4314208ddfdd52728d17162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Thu, 6 Oct 2016 22:23:04 +0200 Subject: Remove a potential nullptr dereference, on mam queryid fix coverity CID 153376 --- src/xmpp/biboumi_component.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/xmpp') diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp index b9a8779..49a1fd5 100644 --- a/src/xmpp/biboumi_component.cpp +++ b/src/xmpp/biboumi_component.cpp @@ -598,9 +598,8 @@ bool BiboumiComponent::handle_mam_request(const Stanza& stanza) const auto lines = Database::get_muc_logs(from.bare(), iid.get_local(), iid.get_server(), -1, start, end); for (const db::MucLogLine& line: lines) { - const auto queryid = query->get_tag("queryid"); if (!line.nick.value().empty()) - this->send_archived_message(line, to.full(), from.full(), queryid); + this->send_archived_message(line, to.full(), from.full(), query_id); } this->send_iq_result_full_jid(id, from.full(), to.full()); return true; @@ -617,7 +616,8 @@ void BiboumiComponent::send_archived_message(const db::MucLogLine& log_line, con XmlNode result("result"); result["xmlns"] = MAM_NS; - result["queryid"] = queryid; + if (!queryid.empty()) + result["queryid"] = queryid; result["id"] = log_line.uuid.value(); XmlNode forwarded("forwarded"); -- cgit v1.2.3