From 074aded4469ba9f5efd6f49cd6db0ca7a2fc3435 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Wed, 27 Dec 2023 09:43:50 +0000 Subject: [PATCH] Avoid SE VTS crash Add null check for res.args. Bug: 255656026 Test: compiles Change-Id: I3d018b2c8d192ae35d5cc7f837f730ecf3ace65d --- .../1.0/vts/functional/VtsHalSecureElementV1_0TargetTest.cpp | 1 + .../1.1/vts/functional/VtsHalSecureElementV1_1TargetTest.cpp | 1 + .../1.2/vts/functional/VtsHalSecureElementV1_2TargetTest.cpp | 3 +++ 3 files changed, 5 insertions(+) diff --git a/secure_element/1.0/vts/functional/VtsHalSecureElementV1_0TargetTest.cpp b/secure_element/1.0/vts/functional/VtsHalSecureElementV1_0TargetTest.cpp index 63c2ecafb3..1623960cb5 100644 --- a/secure_element/1.0/vts/functional/VtsHalSecureElementV1_0TargetTest.cpp +++ b/secure_element/1.0/vts/functional/VtsHalSecureElementV1_0TargetTest.cpp @@ -75,6 +75,7 @@ class SecureElementHidlTest : public ::testing::TestWithParam { se_->init(se_cb_); auto res = se_cb_->WaitForCallback(kCallbackNameOnStateChange); EXPECT_TRUE(res.no_timeout); + ASSERT_TRUE(res.args); EXPECT_TRUE(res.args->state_); } diff --git a/secure_element/1.1/vts/functional/VtsHalSecureElementV1_1TargetTest.cpp b/secure_element/1.1/vts/functional/VtsHalSecureElementV1_1TargetTest.cpp index 234c33ca69..d7e45463ef 100644 --- a/secure_element/1.1/vts/functional/VtsHalSecureElementV1_1TargetTest.cpp +++ b/secure_element/1.1/vts/functional/VtsHalSecureElementV1_1TargetTest.cpp @@ -72,6 +72,7 @@ class SecureElementHidlTest : public ::testing::TestWithParam { se_->init_1_1(se_cb_); auto res = se_cb_->WaitForCallback(kCallbackNameOnStateChange); EXPECT_TRUE(res.no_timeout); + ASSERT_TRUE(res.args); EXPECT_TRUE(res.args->state_); EXPECT_NE(res.args->reason_, ""); } diff --git a/secure_element/1.2/vts/functional/VtsHalSecureElementV1_2TargetTest.cpp b/secure_element/1.2/vts/functional/VtsHalSecureElementV1_2TargetTest.cpp index 66d581e223..26b2ded146 100644 --- a/secure_element/1.2/vts/functional/VtsHalSecureElementV1_2TargetTest.cpp +++ b/secure_element/1.2/vts/functional/VtsHalSecureElementV1_2TargetTest.cpp @@ -73,6 +73,7 @@ class SecureElementHidlTest : public ::testing::TestWithParam { se_->init_1_1(se_cb_); auto res = se_cb_->WaitForCallback(kCallbackNameOnStateChange); EXPECT_TRUE(res.no_timeout); + ASSERT_TRUE(res.args); EXPECT_TRUE(res.args->state_); EXPECT_NE(res.args->reason_, ""); } @@ -93,10 +94,12 @@ TEST_P(SecureElementHidlTest, Reset) { auto res = se_cb_->WaitForCallback(kCallbackNameOnStateChange); EXPECT_TRUE(res.no_timeout); + ASSERT_TRUE(res.args); EXPECT_FALSE(res.args->state_); res = se_cb_->WaitForCallback(kCallbackNameOnStateChange); EXPECT_TRUE(res.no_timeout); + ASSERT_TRUE(res.args); EXPECT_TRUE(res.args->state_); }