commit bce78d1105e0bb0ba6fda8d82a9e904a1e606992
author Weilin Xu <xuweilin@google.com> Thu Jul 20 21:32:03 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 20 21:32:03 2023 +0000
tree 5962d432443e675e034e35ecdd4afb5659e30dad
parent 13b2b4456500edc5e6aa1a7adf56f344ac544aa3
parent 050c07c475299d4c988f4f368233361d1ef1df25

Fix null pointer crash in AIDL radio HAL VTS am: cf892db1ef am: e065f848d0 am: 050c07c475

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

Change-Id: I52e0a5a66e613108fc60371cb382f3713b34f1b2
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);