diff options
author | Steven Moreland <smoreland@google.com> | 2020-11-18 01:16:39 +0000 |
---|---|---|
committer | Anis Assi <anisassi@google.com> | 2021-01-08 02:01:40 -0800 |
commit | 07655c7c8eac00fd7454ee641b53faeb2f954fe6 (patch) | |
tree | acff1f7471ecd4b96316a0dad4f00cf329e537b9 | |
parent | 79de50713acfb1a76609a2edd1bf147a88ebcb2d (diff) | |
download | hidl-07655c7c8eac00fd7454ee641b53faeb2f954fe6.tar.gz |
hidl_test_java: reflect new overread check in artandroid-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android11-security-release
This was passing before because of some other checks which caught the
mismatch resulting from an overread.
Ignore-AOSP-First: security
Bug: 172655291
Test: atest hidl_test_java
Merged-In: Ie3766d20597ed9714ab3c3beead8af01226f58ba
Change-Id: Ie3766d20597ed9714ab3c3beead8af01226f58ba
(cherry picked from commit aeae74893c6973959fe58b6e8e045fc4be2b8d32)
(cherry picked from commit f9a784013d8b6d519e66c2bee6384ad8a713ac25)
-rw-r--r-- | test/java_test/hidl_test_java_native.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/test/java_test/hidl_test_java_native.cpp b/test/java_test/hidl_test_java_native.cpp index fff777f4..4c479f23 100644 --- a/test/java_test/hidl_test_java_native.cpp +++ b/test/java_test/hidl_test_java_native.cpp @@ -301,13 +301,11 @@ TEST_F(HidlTest, SomeOtherBaseMethodInvalidString) { } }; - auto ret = baz->someOtherBaseMethod(foo, [&](const auto&) { - ADD_FAILURE() << "Should not accept invalid UTF-8 String"; + auto ret = baz->someOtherBaseMethod(foo, [](const IBase::Foo& ret) { + EXPECT_EQ(ret.y.s, "?"); // :) }); - EXPECT_FALSE(ret.isOk()); - - EXPECT_OK(baz->ping()); + EXPECT_TRUE(ret.isOk()); } TEST_F(HidlTest, BazSomeMethodWithFooArraysTest) { |