diff options
| author | louiz’ <louiz@louiz.org> | 2017-02-01 10:04:20 +0100 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2017-02-01 10:04:20 +0100 |
| commit | 9b7732dbd5c21ba44fb71b12186050b7825118b6 (patch) | |
| tree | 69e89ab6f41f835aacc8950c62d4d03f22007d87 /debian/patches/020161204~eb8f1cb.patch | |
| parent | 45f7396c8d30ed37570c4ecdaa886388f9beba3e (diff) | |
| parent | 8c575094d24d52faa64238d78f849577faaf1bab (diff) | |
| download | biboumi-9b7732dbd5c21ba44fb71b12186050b7825118b6.tar.gz biboumi-9b7732dbd5c21ba44fb71b12186050b7825118b6.tar.bz2 biboumi-9b7732dbd5c21ba44fb71b12186050b7825118b6.tar.xz biboumi-9b7732dbd5c21ba44fb71b12186050b7825118b6.zip | |
Merge remote-tracking branch 'debian/master' into debian
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); |