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

Commit 5ec3c722 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix coverity scan issue: uninitialized scalar variable" into main am: 00204096 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2383937



Change-Id: Ib390bc73959df9a3474b57999c192d44b95ff4a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents faac5699 00204096

system/bta/av/bta_av_act.cc

+2 −0
Original line number Diff line number Diff line
@@ -1047,6 +1047,8 @@ void bta_av_rc_msg(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data) { 
      av.remote_rsp.key_state = p_data->rc_msg.msg.pass.state;

      av.remote_rsp.rsp_code = p_data->rc_msg.msg.hdr.ctype;

      av.remote_rsp.label = p_data->rc_msg.label;

      av.remote_rsp.len = p_data->rc_msg.msg.pass.pass_len;

      av.remote_rsp.p_data = NULL;



      /* If this response is for vendor unique command  */

      if ((p_data->rc_msg.msg.pass.op_id == AVRC_ID_VENDOR) &&

system/btif/src/btif_rc.cc

+1 −1
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ void handle_rc_vendorunique_rsp(tBTA_AV_REMOTE_RSP* p_remote_rsp) { 
      key_state = 0;

    }



    if (p_remote_rsp->len > 0) {

    if (p_remote_rsp->len > 0 && p_remote_rsp->p_data != NULL) {

      if (p_remote_rsp->len >= AVRC_PASS_THRU_GROUP_LEN)

        vendor_id = p_remote_rsp->p_data[AVRC_PASS_THRU_GROUP_LEN - 1];

      osi_free_and_reset((void**)&p_remote_rsp->p_data);