Skip to content

Commit

Permalink
obexd/MAP: Fix sending \0 after filler byte
Browse files Browse the repository at this point in the history
It is not necessary to append \0 after the filler byte (0x30), the spec
just talk about the a byte not bytes.
  • Loading branch information
Vudentz authored and Johan Hedberg committed Oct 9, 2013
1 parent afeb0d0 commit fd02ee7
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions obexd/client/map.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit fd02ee7

Please sign in to comment.