commit | cf892db1ef4845b9b2e85ab0481981724037509f | [log] [tgz] |
---|---|---|
author | Weilin Xu <xuweilin@google.com> | Wed Jul 19 17:20:19 2023 +0000 |
committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Wed Jul 19 19:46:04 2023 +0000 |
tree | c608be0190dbb97829013915e1d4e5cc7c0eb3ce | |
parent | d8f18469c335daee6e49c65ef0c8a6f8b1f8a697 [diff] [blame] |
Fix null pointer crash in AIDL radio HAL VTS Bug: 277531858 Test: atest VtsHalBroadcastradioAidlTargetTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:978de0a8a4968774e81e10e716a46bd9e1369479) Merged-In: Icb67c27b9a747411a9bfbd48647e6e6046cf5e8d Change-Id: Icb67c27b9a747411a9bfbd48647e6e6046cf5e8d
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);