From 06271729e33300cebbd7222f50a2b38905e33cae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Mon, 22 Jan 2018 20:57:34 +0100
Subject: Fix a crash happening when a user cancels a non-existing ad-hoc
 session

---
 src/xmpp/adhoc_commands_handler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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";
-- 
cgit v1.2.3


From 23e51e814f330ee06dc4dac29d1b2f328e8238b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Mon, 22 Jan 2018 21:01:50 +0100
Subject: Release version 7.1

---
 CHANGELOG.rst                | 5 +++++
 CMakeLists.txt               | 2 +-
 packaging/biboumi.spec.cmake | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

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/CMakeLists.txt b/CMakeLists.txt
index 4dc9d63..b31d718 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0)
 project(biboumi)
 
 set(${PROJECT_NAME}_VERSION_MAJOR 7)
-set(${PROJECT_NAME}_VERSION_MINOR 0)
+set(${PROJECT_NAME}_VERSION_MINOR 1)
 set(${PROJECT_NAME}_VERSION_SUFFIX "")
 
 if(NOT CMAKE_BUILD_TYPE)
diff --git a/packaging/biboumi.spec.cmake b/packaging/biboumi.spec.cmake
index 95f19e1..0bb0db8 100644
--- a/packaging/biboumi.spec.cmake
+++ b/packaging/biboumi.spec.cmake
@@ -63,6 +63,9 @@ make check %{?_smp_mflags}
 
 
 %changelog
+* 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
 
-- 
cgit v1.2.3