summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-05-21 11:54:50 +0200
committerJonas Smedegaard <dr@jones.dk>2017-05-21 11:54:50 +0200
commitf73b4138c9b71962f81c02ab0a7ee2baa077bba6 (patch)
treeeddcee9fe2d3f9f53c311635deef81b48bc74b94
parent7b472d5129162a50a991174ce3c6317ab50b3c29 (diff)
downloadbiboumi-f73b4138c9b71962f81c02ab0a7ee2baa077bba6.tar.gz
biboumi-f73b4138c9b71962f81c02ab0a7ee2baa077bba6.tar.bz2
biboumi-f73b4138c9b71962f81c02ab0a7ee2baa077bba6.tar.xz
biboumi-f73b4138c9b71962f81c02ab0a7ee2baa077bba6.zip
Drop patch cherry-picked upstream but now mysteriously gone from upstream master branch.
-rw-r--r--debian/patches/020161204~eb8f1cb.patch24
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 25 deletions
diff --git a/debian/patches/020161204~eb8f1cb.patch b/debian/patches/020161204~eb8f1cb.patch
deleted file mode 100644
index e303cbc..0000000
--- a/debian/patches/020161204~eb8f1cb.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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);
diff --git a/debian/patches/series b/debian/patches/series
index f6c33bb..3505552 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-020161204~eb8f1cb.patch
2001_cmake_ignore_git.patch
2002_fix_default_locale.patch