From fd02ee7b32b32523d3eb6ba3ac98a0bdb2b8bef1 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Wed, 9 Oct 2013 14:11:40 +0300 Subject: obexd/MAP: Fix sending \0 after filler byte It is not necessary to append \0 after the filler byte (0x30), the spec just talk about the a byte not bytes. --- obexd/client/map.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'obexd') diff --git a/obexd/client/map.c b/obexd/client/map.c index 4373d746c..9d90a9284 100644 --- a/obexd/client/map.c +++ b/obexd/client/map.c @@ -729,7 +729,7 @@ static void set_status(const GDBusPropertyTable *property, gboolean value; GError *err = NULL; GObexApparam *apparam; - char contents[2]; + char contents[1]; char handle[21]; if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_BOOLEAN) { @@ -742,7 +742,6 @@ static void set_status(const GDBusPropertyTable *property, dbus_message_iter_get_basic(iter, &value); contents[0] = FILLER_BYTE; - contents[1] = '\0'; if (snprintf(handle, sizeof(handle), "%" PRIu64, msg->handle) < 0) goto fail; @@ -1612,13 +1611,12 @@ static DBusMessage *map_update_inbox(DBusConnection *connection, { struct map_data *map = user_data; DBusMessage *reply; - char contents[2]; + char contents[1]; struct obc_transfer *transfer; GError *err = NULL; struct pending_request *request; contents[0] = FILLER_BYTE; - contents[1] = '\0'; transfer = obc_transfer_put("x-bt/MAP-messageUpdate", NULL, NULL, contents, sizeof(contents), @@ -1935,7 +1933,7 @@ static bool set_notification_registration(struct map_data *map, bool status) struct obc_transfer *transfer; GError *err = NULL; GObexApparam *apparam; - char contents[2]; + char contents[1]; const char *address; address = obc_session_get_destination(map->session); @@ -1951,7 +1949,6 @@ static bool set_notification_registration(struct map_data *map, bool status) } contents[0] = FILLER_BYTE; - contents[1] = '\0'; transfer = obc_transfer_put("x-bt/MAP-NotificationRegistration", NULL, NULL, contents, sizeof(contents), &err); -- cgit v1.2.3