From e8c8dab8c037d82b68c4360dd70fe762bf038ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=B8=B0?= Date: Mon, 28 Oct 2024 06:27:34 +0000 Subject: [PATCH] =?UTF-8?q?cherry=20pick=20ab31bd8=20from=20https://gitee.?= =?UTF-8?q?com/fengliucs/drivers=5Finterface=5F2/pulls/1324=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=95=B0=E6=8D=AE=E5=AE=B9=E5=99=A8=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 刘丰 --- camera/metadata/src/metadata_utils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/camera/metadata/src/metadata_utils.cpp b/camera/metadata/src/metadata_utils.cpp index 40cb2157..ebf2d931 100644 --- a/camera/metadata/src/metadata_utils.cpp +++ b/camera/metadata/src/metadata_utils.cpp @@ -82,13 +82,13 @@ bool MetadataUtils::ConvertMetadataToVec(const std::shared_ptr & } uint32_t itemCapacity = GetCameraMetadataItemCapacity(meta); - if (itemCapacity > MAX_ITEM_CAPACITY) { + if (itemCapacity > MAX_ITEM_CAPACITY || itemCapacity == 0) { METADATA_ERR_LOG("ConvertMetadataToVec itemCapacity out of range:%{public}d", itemCapacity); return false; } uint32_t dataCapacity = GetCameraMetadataDataSize(meta); - if (dataCapacity > MAX_DATA_CAPACITY) { + if (dataCapacity > MAX_DATA_CAPACITY || dataCapacity == 0) { METADATA_ERR_LOG("ConvertMetadataToVec dataCapacity out of range:%{public}d", dataCapacity); return false; } -- Gitee