From a2856bd25639e9c76b413f128ac7ed1730f37a3e Mon Sep 17 00:00:00 2001 From: wujianlin Date: Mon, 4 Nov 2024 11:07:26 +0800 Subject: [PATCH] add fd and handle type to ValidateReadData Issue: https://gitee.com/openharmony/commonlibrary_c_utils/issues/IB1RE7?from=project-issue Signed-off-by: wujianlin --- base/src/parcel.cpp | 6 +++--- base/test/unittest/common/utils_parcel_test.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/src/parcel.cpp b/base/src/parcel.cpp index 4696e5c..bd23910 100644 --- a/base/src/parcel.cpp +++ b/base/src/parcel.cpp @@ -183,9 +183,9 @@ bool Parcel::ValidateReadData([[maybe_unused]]size_t upperBound) size_t nextObj = nextObjectIdx_; do { if (readPos < objects[nextObj] + sizeof(parcel_flat_binder_object)) { - if (!IsReadObjectData(nextObj, upperBound)) { - return false; - } + UTILS_LOGE("Non-object Read object data, readPos = %{public}zu, upperBound = %{public}zu", + readCursor_, upperBound); + return false; } nextObj++; } while (nextObj < objSize && upperBound > objects[nextObj]); diff --git a/base/test/unittest/common/utils_parcel_test.cpp b/base/test/unittest/common/utils_parcel_test.cpp index 255d937..2222851 100644 --- a/base/test/unittest/common/utils_parcel_test.cpp +++ b/base/test/unittest/common/utils_parcel_test.cpp @@ -2113,7 +2113,7 @@ HWTEST_F(UtilsParcelTest, test_multiRemoteObjectReadBuffer_004, TestSize.Level0) EXPECT_EQ(result, true); const uint8_t *buffer = parcel.ReadBuffer(sizeof(parcel_flat_binder_object) * 3); - EXPECT_EQ(true, buffer != nullptr); + EXPECT_EQ(true, buffer == nullptr); } HWTEST_F(UtilsParcelTest, test_multiRemoteObjectReadBuffer_005, TestSize.Level0) -- Gitee