commit a0141af9f6dfc5c9dfb6995dadc9c8c33920ba85
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Mar 18 23:49:34 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 18 23:49:34 2024 +0000
tree 19f287d7e218414d9289d74085d2a1ff11f46e74
parent 80f53f4d0559ac814f0cd1a61107259f98bf3bf2
parent b4cb70df1b3a1749f3a24cd5636c97fac6cbf993

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

cmds/lshal/ListCommand.cpp

diff --git a/cmds/lshal/ListCommand.cpp b/cmds/lshal/ListCommand.cpp
index 870e8eb..0c1feb8 100644
--- a/cmds/lshal/ListCommand.cpp
+++ b/cmds/lshal/ListCommand.cpp
@@ -731,16 +731,17 @@
                                   [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 {
-            auto&& hashArray = (*hashChain)[hashIndex];
-            entry->hash = android::base::HexString(hashArray.data(), hashArray.size());
+            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;