commit | 6adbf0c117bffd5c7ddf0447f756d32f3ea6cf2f | [log] [tgz] |
---|---|---|
author | Liu, Kai1 <kai1.liu@intel.com> | Wed May 15 14:58:43 2024 +0800 |
committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Mon Jul 15 17:00:19 2024 +0000 |
tree | 66c88c69c89588052bfca78e920686de6ef3e2ee | |
parent | 0309dddb6c5f5c5b72e1be90bbaef3c01f357ac2 [diff] [blame] |
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 <kai1.liu@intel.com> (cherry picked from https://android-review.googlesource.com/q/commit:aec33e9a41e4bccfd1834e1ab03f785eea4f0b52) Merged-In: I3b30d491ef886b98e462447e6de78828e7822fca Change-Id: I3b30d491ef886b98e462447e6de78828e7822fca
diff --git a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp index f72cf55..012aa3f 100644 --- a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp +++ b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
@@ -1839,7 +1839,7 @@ 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;