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

Commit d555bede authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Get rid of memory leak in remote name request handling" into main am:... 

Merge "Get rid of memory leak in remote name request handling" into main am: 66dbf901 am: d971fe54

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



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

system/main/shim/acl_api.cc

+2 −5
Original line number Diff line number Diff line
@@ -227,13 +227,10 @@ void bluetooth::shim::ACL_RemoteNameRequest(const RawAddress& addr, 
                base::BindOnce(

                    [](RawAddress addr, hci::ErrorCode status,

                       std::array<uint8_t, 248> name) {

                      auto p = (uint8_t*)osi_malloc(name.size());

                      std::copy(name.begin(), name.end(), p);



                      btm_process_remote_name(&addr, p, name.size(),

                      btm_process_remote_name(&addr, name.data(), name.size(),

                                              static_cast<tHCI_STATUS>(status));

                      btm_sec_rmt_name_request_complete(

                          &addr, p, static_cast<tHCI_STATUS>(status));

                          &addr, name.data(), static_cast<tHCI_STATUS>(status));

                    },

                    addr, status, name));

          },