commit e065f848d0ee6b512e9bf5ddc8c1fdf5ccde82a2
author Weilin Xu <xuweilin@google.com> Thu Jul 20 19:55:55 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 20 19:55:55 2023 +0000
tree c608be0190dbb97829013915e1d4e5cc7c0eb3ce
parent a0dc5d033cf7b7fe950ac9082de5326039e27fd4
parent cf892db1ef4845b9b2e85ab0481981724037509f

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

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

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