summaryrefslogtreecommitdiff
path: root/debian/patches/020161204~eb8f1cb.patch
blob: e303cbc2915106c944eb67599d30eb0d93c63963 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
Description: Avoid a potential nullptr dereference
Origin: upstream, https://lab.louiz.org/louiz/biboumi/commit/eb8f1cb
Author: louiz’ <louiz@louiz.org>
Forwarded: yes
Last-Update: 2016-12-21

--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -570,13 +570,11 @@
     Jid to(stanza.get_tag("to"));
 
     const XmlNode* query = stanza.get_child("query", MAM_NS);
-    std::string query_id;
-    if (query)
-      query_id = query->get_tag("queryid");
 
     Iid iid(to.local, {'#', '&'});
-    if (iid.type == Iid::Type::Channel && to.resource.empty())
+    if (query && iid.type == Iid::Type::Channel && to.resource.empty())
       {
+        const std::string query_id = query->get_tag("queryid");
         std::string start;
         std::string end;
         const XmlNode* x = query->get_child("x", DATAFORM_NS);