From 843c90dfc5e2b25da998069a7683e74292d205c2 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Mon, 16 Jun 2014 15:27:35 +0200 Subject: [PATCH] android/hal-health: Fix not setting offsets for empty strings In register_app command all strings except app name are optional. Those are passed over IPC concatenated and offsets are used to determine string presence and length. --- android/hal-health.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/hal-health.c b/android/hal-health.c index 012b6b72d..ab0665804 100644 --- a/android/hal-health.c +++ b/android/hal-health.c @@ -93,23 +93,23 @@ static bt_status_t register_application(bthl_reg_param_t *reg, int *app_id) memcpy(cmd->data, reg->application_name, len); off += len; + cmd->provider_name_off = off; if (reg->provider_name) { len = strlen(reg->provider_name) + 1; - cmd->provider_name_off = off; memcpy(cmd->data + off, reg->provider_name, len); off += len; } + cmd->service_name_off = off; if (reg->srv_name) { len = strlen(reg->srv_name) + 1; - cmd->service_name_off = off; memcpy(cmd->data + off, reg->srv_name, len); off += len; } + cmd->service_descr_off = off; if (reg->srv_desp) { len = strlen(reg->srv_desp) + 1; - cmd->service_descr_off = off; memcpy(cmd->data + off, reg->srv_desp, len); off += len; } -- 2.47.3