From 6adbf0c117bffd5c7ddf0447f756d32f3ea6cf2f Mon Sep 17 00:00:00 2001 From: "Liu, Kai1" Date: Wed, 15 May 2024 14:58:43 +0800 Subject: [PATCH] Assert the errors size to 1 for case SetDisplayBrightness null pointer dereference crash will be triggered if vector errors is emptry when accessing errors[0].errorCode, so change EXPECT_EQ to ASSERT_EQ to avoid this issue. Test: run vts -m VtsHalGraphicsComposer3_TargetTest Signed-off-by: Liu, Kai1 (cherry picked from https://android-review.googlesource.com/q/commit:aec33e9a41e4bccfd1834e1ab03f785eea4f0b52) Merged-In: I3b30d491ef886b98e462447e6de78828e7822fca Change-Id: I3b30d491ef886b98e462447e6de78828e7822fca --- .../composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp index f72cf55300..012aa3f31b 100644 --- a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp +++ b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp @@ -1839,7 +1839,7 @@ TEST_P(GraphicsComposerAidlCommandTest, SetDisplayBrightness) { writer.setDisplayBrightness(getPrimaryDisplayId(), /*brightness*/ 0.5f, -1.f); execute(); const auto errors = mReader.takeErrors(); - EXPECT_EQ(1, errors.size()); + ASSERT_EQ(1, errors.size()); EXPECT_EQ(IComposerClient::EX_UNSUPPORTED, errors[0].errorCode); GTEST_SUCCEED() << "SetDisplayBrightness is not supported"; return;