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

Commit a662c6a0 authored by Zixuan Qu's avatar Zixuan Qu
Browse files

Fix potential null pointer derefence on bt_rc_ctrl_callbacks. 

Bug: 311819798
Test: m com.android.btservices
Test: Manual bluetooth pairing

Change-Id: I2cc00d690278ccd159304968dfbbbca4af6493db
parent bb570806

system/btif/src/btif_rc.cc

+8 −3
Original line number Diff line number Diff line
@@ -813,9 +813,14 @@ void handle_rc_browse_connect(tBTA_AV_RC_BROWSE_OPEN* p_rc_br_open) { 
        LOG_VERBOSE("%s: pending rc browse connection event", __func__);

      }

    } else {

      do_in_jni_thread(FROM_HERE,

                       base::BindOnce(bt_rc_ctrl_callbacks->connection_state_cb,

                                      true, true, p_dev->rc_addr));

        if (bt_rc_ctrl_callbacks != NULL) {

          do_in_jni_thread(

              FROM_HERE,

              base::BindOnce(bt_rc_ctrl_callbacks->connection_state_cb, true,

                             true, p_dev->rc_addr));

        } else {

            LOG_WARN("%s: bt_rc_ctrl_callbacks is null.", __func__);

        }

    }

  }

}