diff options
author | Jonas Smedegaard <dr@jones.dk> | 2016-12-21 22:21:36 +0100 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2016-12-21 23:53:51 +0100 |
commit | 176a1fcdf53f54c92fbc57f49f610bb7c91ec8f4 (patch) | |
tree | 9257afc86da77a10ab8ff9fe69c4a938c44669a4 /debian/patches/020161204~eb8f1cb.patch | |
parent | af78b62e3216e39aa013f877d24fdfd989736df7 (diff) | |
download | biboumi-176a1fcdf53f54c92fbc57f49f610bb7c91ec8f4.tar.gz biboumi-176a1fcdf53f54c92fbc57f49f610bb7c91ec8f4.tar.bz2 biboumi-176a1fcdf53f54c92fbc57f49f610bb7c91ec8f4.tar.xz biboumi-176a1fcdf53f54c92fbc57f49f610bb7c91ec8f4.zip |
Add some bugfix patches cherry-picked upstream.
Diffstat (limited to 'debian/patches/020161204~eb8f1cb.patch')
-rw-r--r-- | debian/patches/020161204~eb8f1cb.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/debian/patches/020161204~eb8f1cb.patch b/debian/patches/020161204~eb8f1cb.patch new file mode 100644 index 0000000..e303cbc --- /dev/null +++ b/debian/patches/020161204~eb8f1cb.patch @@ -0,0 +1,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); |