| commit | 517aab51c9e6aa316fdb4359dea0654889c79a45 | [log] [tgz] |
|---|---|---|
| author | shla <shla@synaptics.com> | Thu Jun 03 22:47:40 2021 -0700 |
| committer | Jay Patel <pateljay@google.com> | Mon Jun 07 13:25:13 2021 +0000 |
| tree | 67de3d7b62008a74dcdeaab8739cbcd9c6eae8aa | |
| parent | 9edfd34da935b200e8d868e29d15b6539229a2da [diff] |
Fix a null pointer access in Tuner VTS With Vts suite "11_r4/7337463”, meet a crash issue when run case "PerInstance/TunerRecordHidlTest#LnbRecordDataFlowWithTsRecordFilterTest/0_default". The crash is introduced by https://android.googlesource.com/platform/hardware/interfaces/+/7402e02ebc5d1a4d7f29e7900f0a069faa2236bc The "mLnbId" is a null pointer but it does "*mLnbId = ids[0];" which will obviously lead to crash. After changing to "mLnbId = &ids[0];", all cases can PASS. Bug: 189974145 Change-Id: Ic593bfd00fa53365af4bbfeb7512e392f516468c
diff --git a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp index 6e119f9..7c7f0f6 100644 --- a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp +++ b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp
@@ -221,7 +221,7 @@ return; } ASSERT_TRUE(mLnbTests.openLnbById(ids[0])); - *mLnbId = ids[0]; + mLnbId = &ids[0]; ASSERT_TRUE(mLnbTests.setLnbCallback()); ASSERT_TRUE(mLnbTests.setVoltage(lnbConf.voltage)); ASSERT_TRUE(mLnbTests.setTone(lnbConf.tone));