Re: [PATCH 2/5] avrcp: fix overwrite of number of attributes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Lucas,

On Thu, Sep 15, 2011 at 7:21 AM, Lucas De Marchi
<lucas.demarchi@xxxxxxxxxxxxxx> wrote:
> The response of GetCurrentPlayerApplicationSettingValue expects the
> first operand to be the number of attributes in response. Since we start
> with len=0, we were overwriting this number with the value of the first
> attribute.
>
> Also use g_memdup instead of g_malloc + memcpy.
> ---
>  audio/avrcp.c |   12 +++++-------
>  1 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/audio/avrcp.c b/audio/avrcp.c
> index 9b1d797..783ba02 100644
> --- a/audio/avrcp.c
> +++ b/audio/avrcp.c
> @@ -947,8 +947,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct media_player *mp,
>         * Save a copy of requested settings because we can override them
>         * while responding
>         */
> -       settings = g_malloc(pdu->params[0]);
> -       memcpy(settings, &pdu->params[1], pdu->params[0]);
> +       settings = g_memdup(&pdu->params[1], pdu->params[0]);
>        len = 0;
>
>        /*
> @@ -972,16 +971,15 @@ static uint8_t avrcp_handle_get_current_player_value(struct media_player *mp,
>                        continue;
>                }
>
> -               pdu->params[len] = settings[i];
> -               pdu->params[len + 1] = val;
> -               len += 2;
> +               pdu->params[++len] = settings[i];
> +               pdu->params[++len] = val;
>        }
>
>        g_free(settings);
>
>        if (len) {
> -               pdu->params[0] = len;
> -               pdu->params_len = htons(2 * len + 1);
> +               pdu->params[0] = len / 2;
> +               pdu->params_len = htons(len + 1);
>
>                return AVC_CTYPE_STABLE;
>        }
> --
> 1.7.6.1
>
> --

Ack.

-- 
Luiz Augusto von Dentz
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux