aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2020-11-18 01:16:39 +0000
committerAnis Assi <anisassi@google.com>2021-01-08 02:01:40 -0800
commit07655c7c8eac00fd7454ee641b53faeb2f954fe6 (patch)
treeacff1f7471ecd4b96316a0dad4f00cf329e537b9
parent79de50713acfb1a76609a2edd1bf147a88ebcb2d (diff)
downloadhidl-07655c7c8eac00fd7454ee641b53faeb2f954fe6.tar.gz
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.cpp8
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) {