From 35d9820089321933a75dcd560d63d72dc0fb1e17 Mon Sep 17 00:00:00 2001 From: yangkan Date: Wed, 18 Sep 2024 10:28:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0CmdRequest=E9=9D=9E=E9=9B=B6?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangkan --- display/composer/v1_0/display_command/display_cmd_responser.h | 4 ++-- display/composer/v1_0/display_command/display_cmd_utils.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/display/composer/v1_0/display_command/display_cmd_responser.h b/display/composer/v1_0/display_command/display_cmd_responser.h index 91e5b28c..92457598 100755 --- a/display/composer/v1_0/display_command/display_cmd_responser.h +++ b/display/composer/v1_0/display_command/display_cmd_responser.h @@ -158,8 +158,8 @@ public: int32_t CmdRequest(uint32_t inEleCnt, const std::vector& inFds, uint32_t& outEleCnt, std::vector& outFds) { - if (inEleCnt > CmdUtils::MAX_ELE_COUNT) { - HDF_LOGE("%{public}s: inEleCnt:%{public}u is too large", __func__, inEleCnt); + if (inEleCnt > CmdUtils::MAX_ELE_COUNT || inEleCnt == CmdUtils::ZERO_ELE_COUNT) { + HDF_LOGE("%{public}s: inEleCnt:%{public}u is invalid", __func__, inEleCnt); return HDF_FAILURE; } std::shared_ptr requestData(new char[inEleCnt * CmdUtils::ELEMENT_SIZE], std::default_delete()); diff --git a/display/composer/v1_0/display_command/display_cmd_utils.h b/display/composer/v1_0/display_command/display_cmd_utils.h index db512bbb..ba155704 100644 --- a/display/composer/v1_0/display_command/display_cmd_utils.h +++ b/display/composer/v1_0/display_command/display_cmd_utils.h @@ -43,6 +43,7 @@ public: static constexpr uint32_t INIT_ELEMENT_COUNT = 32 * 1024; static constexpr uint32_t MAX_MEMORY = 10485760; // 10M static constexpr uint32_t MAX_ELE_COUNT = 100000; + static constexpr uint32_t ZERO_ELE_COUNT = 0; #define SWITCHCASE(x) case (x): {return #x;} static const char *CommandToString(int32_t cmdId) -- Gitee