Return an error if the Stop is called and the service is not running

1 files changed, 8 insertions, 1 deletions

diff --git a/hcid/dbus-service.c b/hcid/dbus-service.c
index dc1f7552..1d268280 100644
--- a/hcid/dbus-service.c
+++ b/hcid/dbus-service.c
@@ -406,7 +406,14 @@ static DBusHandlerResult stop(DBusConnection *conn,
 	DBusPendingCall *pending;
 	struct service_call *call_data;
 	struct service_agent *agent  = data;
-	DBusMessage *forward = dbus_message_copy(msg);
+	DBusMessage *forward;
+
+	if (!agent->running)
+		return error_failed(conn, msg, EPERM);
+
+	forward = dbus_message_copy(msg);
+	if (!forward)
+		return DBUS_HANDLER_RESULT_NEED_MEMORY;
 
 	dbus_message_set_destination(forward, agent->id);
 	dbus_message_set_interface(forward, "org.bluez.ServiceAgent");