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

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

Merge "lshal: Fix empty hidl_array access." into main

parents 80f53f4d b4cb70df
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -731,16 +731,17 @@ Status ListCommand::fetchBinderizedEntry(const sp<IServiceManager> &manager,
                                  [hashChain](const auto& ret) { *hashChain = std::move(ret); });
        if (!hashRet.isOk()) {
            handleError(TRANSACTION_ERROR, "getHashChain failed: " + hashRet.description());
            break; // skip getHashChain
        }
        if (static_cast<size_t>(hashIndex) >= hashChain->size()) {
            handleError(BAD_IMPL,
                        "interfaceChain indicates position " + std::to_string(hashIndex) +
                                " but getHashChain returns " + std::to_string(hashChain->size()) +
                                " hashes");
        } else {
            break; // skip getHashChain
        }
        auto&& hashArray = (*hashChain)[hashIndex];
        entry->hash = android::base::HexString(hashArray.data(), hashArray.size());
        }
    } while (0);
    if (status == OK) {
        entry->serviceStatus = ServiceStatus::ALIVE;