From 8243898f066de90a65ba55ee679f90b36f4c0f9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Sun, 17 Aug 2025 03:13:36 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- camera/sequenceable/map_data/map_data_sequenceable.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera/sequenceable/map_data/map_data_sequenceable.cpp b/camera/sequenceable/map_data/map_data_sequenceable.cpp index 31cd7b67..898107bb 100644 --- a/camera/sequenceable/map_data/map_data_sequenceable.cpp +++ b/camera/sequenceable/map_data/map_data_sequenceable.cpp @@ -46,7 +46,7 @@ sptr MapDataSequenceable::Unmarshalling(Parcel &parcel) } int32_t size = parcel.ReadInt32(); - if (size <= 0 || size > BUFFER_MAX_USER_DATA_COUNT) { + if (size < 0 || size > BUFFER_MAX_USER_DATA_COUNT) { HDI_CAMERA_LOGE("invalid size: %{public}d obtained from Parcel", size); return nullptr; } -- Gitee From ab40e58d536e57406137043505b172c55b6c748f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Mon, 25 Aug 2025 08:20:55 +0000 Subject: [PATCH 2/3] d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- camera/metadata/include/camera_metadata_operator.h | 1 - camera/metadata/src/camera_metadata_info.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/camera/metadata/include/camera_metadata_operator.h b/camera/metadata/include/camera_metadata_operator.h index 8c1a812b..2664d9a2 100644 --- a/camera/metadata/include/camera_metadata_operator.h +++ b/camera/metadata/include/camera_metadata_operator.h @@ -33,7 +33,6 @@ #define INDEX_COUNTER 2 #define WRAP_LENGTH 4 -#define ENTRY_DATA_SIZE 4 // data type enum { diff --git a/camera/metadata/src/camera_metadata_info.cpp b/camera/metadata/src/camera_metadata_info.cpp index d7dc536a..b5944047 100644 --- a/camera/metadata/src/camera_metadata_info.cpp +++ b/camera/metadata/src/camera_metadata_info.cpp @@ -955,7 +955,7 @@ int CameraMetadata::GetCameraMetadataItem(const common_metadata_header_t *src, u METADATA_ERR_LOG("GetCameraMetadataItem: memset_s failed"); return CAM_META_FAILURE; } - if (index >= src->item_count || index >= src->item_capacity) { + if (index >= src->item_count) { METADATA_ERR_LOG("GetCameraMetadataItem index is greater than item count"); return CAM_META_INVALID_PARAM; } -- Gitee From a209d52618f49c1e7e3602959c98eae4b9e99703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Mon, 25 Aug 2025 08:21:01 +0000 Subject: [PATCH 3/3] d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- camera/metadata/include/metadata_utils.h | 1 - camera/metadata/src/metadata_utils.cpp | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/camera/metadata/include/metadata_utils.h b/camera/metadata/include/metadata_utils.h index 10f94f97..4ff73ea2 100644 --- a/camera/metadata/include/metadata_utils.h +++ b/camera/metadata/include/metadata_utils.h @@ -23,7 +23,6 @@ #include "camera_metadata_info.h" #include "message_parcel.h" -#include "camera_metadata_item_info.h" namespace OHOS::Camera { class MetadataUtils { diff --git a/camera/metadata/src/metadata_utils.cpp b/camera/metadata/src/metadata_utils.cpp index d71a4318..c8b23888 100644 --- a/camera/metadata/src/metadata_utils.cpp +++ b/camera/metadata/src/metadata_utils.cpp @@ -103,13 +103,8 @@ bool MetadataUtils::ConvertMetadataToVec(const std::shared_ptr & WriteData(item.data_type, cameraAbility); WriteData(item.count, cameraAbility); if (item.count > MAX_SUPPORTED_ITEMS) { - METADATA_ERR_LOG("ConvertMetadataToVec item.count out of range:%{public}d", item.count); - return false; - } - uint32_t dataPayloadBytes = item.count * OHOS_CAMERA_METADATA_TYPE_SIZE[item.data_type]; - if (item.count > ENTRY_DATA_SIZE && - ((item.data.u8 + dataPayloadBytes) > (GetMetadataData(meta) + dataCapacity))) { - METADATA_ERR_LOG("ConvertMetadataToVec get meta item failed!"); + METADATA_ERR_LOG("ConvertMetadataToVec item.count out of range:%{public}d item:%{public}d", + item.count, item.item); return false; } WriteMetadataDataToVec(item, cameraAbility); -- Gitee