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

Commit aa1f8755 authored by Ye Jiao's avatar Ye Jiao Committed by Automerger Merge Worker
Browse files

Fix memory leak in WifiLegacyHal. am: 84310761 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23772717



Change-Id: I6930efc7dfd370c58e9c4f9edda19e356cd51c96
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2316ea20 84310761

wifi/aidl/default/wifi_chip.cpp

+10 −0
Original line number Diff line number Diff line
@@ -1452,14 +1452,24 @@ WifiChip::getSupportedRadioCombinationsInternal() { 
    if (legacy_status != legacy_hal::WIFI_SUCCESS) {

        LOG(ERROR) << "Failed to get SupportedRadioCombinations matrix from legacy HAL: "

                   << legacyErrorToString(legacy_status);

        if (legacy_matrix != nullptr) {

            free(legacy_matrix);

        }

        return {aidl_combinations, createWifiStatusFromLegacyError(legacy_status)};

    }



    if (!aidl_struct_util::convertLegacyRadioCombinationsMatrixToAidl(legacy_matrix,

                                                                      &aidl_combinations)) {

        LOG(ERROR) << "Failed convertLegacyRadioCombinationsMatrixToAidl() ";

        if (legacy_matrix != nullptr) {

            free(legacy_matrix);

        }

        return {aidl_combinations, createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS)};

    }



    if (legacy_matrix != nullptr) {

        free(legacy_matrix);

    }

    return {aidl_combinations, ndk::ScopedAStatus::ok()};

}