Merge tag '7.1'

2018-01-22 21:06:43 +01:00
parent 24b4a09d47 23e51e814f
commit de73a728f2
3 changed files with 9 additions and 1 deletions
@@ -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
 ========================

@@ -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

@@ -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";