summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2018-01-22 21:06:43 +0100
committerlouiz’ <louiz@louiz.org>2018-01-22 21:06:43 +0100
commitde73a728f28df7db3fddd431b07ef5bf6742fb1a (patch)
tree06537615172ded994021f620a155bc4cc7e55109
parent24b4a09d47829994157305cd5ef68a44ac7af27d (diff)
parent23e51e814f330ee06dc4dac29d1b2f328e8238b8 (diff)
downloadbiboumi-de73a728f28df7db3fddd431b07ef5bf6742fb1a.tar.gz
biboumi-de73a728f28df7db3fddd431b07ef5bf6742fb1a.tar.bz2
biboumi-de73a728f28df7db3fddd431b07ef5bf6742fb1a.tar.xz
biboumi-de73a728f28df7db3fddd431b07ef5bf6742fb1a.zip
Merge tag '7.1'
-rw-r--r--CHANGELOG.rst5
-rw-r--r--packaging/biboumi.spec.cmake3
-rw-r--r--src/xmpp/adhoc_commands_handler.cpp2
3 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b553283..0e0d207 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,8 @@
+Version 7.1 - 2018-01-22
+========================
+
+- Fix a crash happening if a user cancels a non-existing ad-hoc session
+
Version 7.0 - 2018-01-17
========================
diff --git a/packaging/biboumi.spec.cmake b/packaging/biboumi.spec.cmake
index a61f4bc..eeec557 100644
--- a/packaging/biboumi.spec.cmake
+++ b/packaging/biboumi.spec.cmake
@@ -66,6 +66,9 @@ make check %{?_smp_mflags}
* ${RPM_DATE} Le Coz Florent <louiz@louiz.org> - ${RPM_VERSION}-1
- Build latest git revision
+* Wed Jan 22 2018 Le Coz Florent <louiz@louiz.org> - 7.1-1
+ Update to version 7.1
+
* Wed Jan 17 2018 Le Coz Florent <louiz@louiz.org> - 7.0-1
Update to version 7.0
diff --git a/src/xmpp/adhoc_commands_handler.cpp b/src/xmpp/adhoc_commands_handler.cpp
index e4dcd5c..bb48781 100644
--- a/src/xmpp/adhoc_commands_handler.cpp
+++ b/src/xmpp/adhoc_commands_handler.cpp
@@ -83,7 +83,7 @@ XmlNode AdhocCommandsHandler::handle_request(const std::string& executor_jid, co
XmlSubNode next(actions, "next");
}
}
- else if (action == "cancel")
+ else if (session_it != this->sessions.end() && action == "cancel")
{
this->sessions.erase(session_it);
command_node["status"] = "canceled";