Remove a potential nullptr dereference, on mam queryid

fix coverity CID 153376
This commit is contained in:
louiz’
2016-10-06 22:29:47 +02:00
parent 5477db7999
commit 0049b3e32d
+3 -3
View File
@@ -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); const auto lines = Database::get_muc_logs(from.bare(), iid.get_local(), iid.get_server(), -1, start, end);
for (const db::MucLogLine& line: lines) for (const db::MucLogLine& line: lines)
{ {
const auto queryid = query->get_tag("queryid");
if (!line.nick.value().empty()) 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()); this->send_iq_result_full_jid(id, from.full(), to.full());
return true; return true;
@@ -617,7 +616,8 @@ void BiboumiComponent::send_archived_message(const db::MucLogLine& log_line, con
XmlNode result("result"); XmlNode result("result");
result["xmlns"] = MAM_NS; result["xmlns"] = MAM_NS;
result["queryid"] = queryid; if (!queryid.empty())
result["queryid"] = queryid;
result["id"] = log_line.uuid.value(); result["id"] = log_line.uuid.value();
XmlNode forwarded("forwarded"); XmlNode forwarded("forwarded");