Re: [PATCH 2/3] android/bluetooth: Add support for get remote service record property cmd

[Johan Hedberg <johan.hedberg@gmail.com>]

Hi Grzegorz,

On Wed, Aug 13, 2014, Grzegorz Kolodziejczyk wrote:
> +static void send_remote_sdp_rec_notify(bt_uuid_t *uuid, int channel,
> +					char *name, uint8_t name_len,
> +					uint8_t status, bdaddr_t *bdaddr)
> +{
> +	struct hal_prop_device_service_rec *prop;
> +	uint8_t buf[BASELEN_REMOTE_DEV_PROP + name_len + sizeof(*prop)];
> +	struct hal_ev_remote_device_props *ev = (void *) buf;
> +	int prop_len = sizeof(*prop) + name_len;
> +
> +	memset(buf, 0, sizeof(buf));
> +
> +	if (status == HAL_STATUS_SUCCESS) {
> +		prop = malloc(sizeof(*prop) + name_len);
> +		prop->name_len = name_len;
> +		prop->channel = (uint16_t)channel;
> +		memcpy(prop->name, name, name_len);
> +		memcpy(prop->uuid, &uuid->value.u128, sizeof(prop->uuid));
> +
> +		memcpy(ev->props[0].val, prop, prop_len);
> +
> +		free(prop);
> +	}

This whole extra malloc (which btw is missing a NULL check) seems
unnecessary to me. Why don't you simply do:

	if (status == HAL_STATUS_SUCCESS) {
		prop = (void *) &ev->props[0].val;

		prop->name_len = name_len;
		prop->channel = channel;
		memcpy(prop->name, name, name_len);
		memcpy(prop->uuid, &uuid->value.u128, sizeof(prop->uuid));
	}

Johan