Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1424708 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "btif_rc: Check AVRC attribute before casting"

parents 9ca56a7e 269a574f

system/btif/src/btif_rc.cc

+3 −5
Original line number Diff line number Diff line
@@ -1441,7 +1441,7 @@ static uint8_t opcode_from_pdu(uint8_t pdu) { 
 *

 ***************************************************************************/

static uint8_t fill_attribute_id_array(

    uint8_t cmd_attribute_number, btrc_media_attr_t* cmd_attribute_id_array,

    uint8_t cmd_attribute_number, const uint32_t* cmd_attribute_id_array,

    size_t out_array_size, btrc_media_attr_t* out_attribute_id_array) {

  /* Default case for cmd_attribute_number == 0xFF, No attribute */

  uint8_t out_attribute_number = 0;
@@ -1516,8 +1516,7 @@ static void btif_rc_upstreams_evt(uint16_t event, tAVRC_COMMAND* pavrc_cmd, 
    case AVRC_PDU_GET_ELEMENT_ATTR: {

      btrc_media_attr_t element_attrs[BTRC_MAX_ELEM_ATTR_SIZE] = {};

      uint8_t num_attr = fill_attribute_id_array(

          pavrc_cmd->get_elem_attrs.num_attr,

          (btrc_media_attr_t*)pavrc_cmd->get_elem_attrs.attrs,

          pavrc_cmd->get_elem_attrs.num_attr, pavrc_cmd->get_elem_attrs.attrs,

          BTRC_MAX_ELEM_ATTR_SIZE, element_attrs);

      if (num_attr == 0) {

        BTIF_TRACE_ERROR(
@@ -1654,8 +1653,7 @@ static void btif_rc_upstreams_evt(uint16_t event, tAVRC_COMMAND* pavrc_cmd, 
    case AVRC_PDU_GET_ITEM_ATTRIBUTES: {

      btrc_media_attr_t item_attrs[BTRC_MAX_ELEM_ATTR_SIZE] = {};

      uint8_t num_attr = fill_attribute_id_array(

          pavrc_cmd->get_attrs.attr_count,

          (btrc_media_attr_t*)pavrc_cmd->get_attrs.p_attr_list,

          pavrc_cmd->get_attrs.attr_count, pavrc_cmd->get_attrs.p_attr_list,

          BTRC_MAX_ELEM_ATTR_SIZE, item_attrs);

      if (num_attr == 0) {

        BTIF_TRACE_ERROR(