commit b974556e9216b98200a4f0df96926334ffb90e05
author Weilin Xu <xuweilin@google.com> Thu Jul 20 21:27:48 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 20 21:27:48 2023 +0000
tree 54f99d85a5069467c8ca4707b714bbf3722c8651
parent 26362ca76cf026213fd88b7f82678e2f8f4d1ef0
parent e1314d36bb64750048bca4542da5f89101301bd3

Fix null pointer crash in AIDL radio HAL VTS am: cf892db1ef am: e065f848d0 am: bf6bd2d8ef am: e1314d36bb

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

Change-Id: I3cb361bf23056b559b5a2495c5198c42a7921cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

broadcastradio/aidl/vts/src/VtsHalBroadcastradioAidlTargetTest.cpp

diff --git a/broadcastradio/aidl/vts/src/VtsHalBroadcastradioAidlTargetTest.cpp b/broadcastradio/aidl/vts/src/VtsHalBroadcastradioAidlTargetTest.cpp
index 8bee1b2..790d60b 100644
--- a/broadcastradio/aidl/vts/src/VtsHalBroadcastradioAidlTargetTest.cpp
+++ b/broadcastradio/aidl/vts/src/VtsHalBroadcastradioAidlTargetTest.cpp
@@ -997,13 +997,12 @@
     LOG(DEBUG) << "SetConfigFlags Test";
 
     auto get = [&](ConfigFlag flag) -> bool {
-        bool* gotValue = nullptr;
+        bool gotValue;
 
-        auto halResult = mModule->isConfigFlagSet(flag, gotValue);
+        auto halResult = mModule->isConfigFlagSet(flag, &gotValue);
 
-        EXPECT_FALSE(gotValue == nullptr);
         EXPECT_TRUE(halResult.isOk());
-        return *gotValue;
+        return gotValue;
     };
 
     auto notSupportedError = resultToInt(Result::NOT_SUPPORTED);