From 0f599582a61b7c4b16bd403394dfcecfca56395c Mon Sep 17 00:00:00 2001 From: xxxx Date: Tue, 27 Sep 2022 21:33:12 +0800 Subject: [PATCH] Description:fix whitelist check Match-id-ca59a6285b7b4554936a7fe2ce3a63cbc68e5087 --- common/include/white_list_util.cpp | 4 ++-- common/include/white_list_util.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/include/white_list_util.cpp b/common/include/white_list_util.cpp index 8a5e6dc..6c2717a 100644 --- a/common/include/white_list_util.cpp +++ b/common/include/white_list_util.cpp @@ -74,7 +74,7 @@ int32_t WhiteListUtil::Init() std::string line; std::size_t lineNum = 0; while (getline(inFile, line)) { - if ((++lineNum > MAX_LINE_NUM) || CheckLine(line)) { + if ((++lineNum > MAX_LINE_NUM) || !IsValidLine(line)) { DHLOGE("whitelist cfg file has too many lines or too complicated. lineNum is %d", lineNum); break; } @@ -116,7 +116,7 @@ int32_t WhiteListUtil::Init() return DH_SUCCESS; } -bool WhiteListUtil::CheckLine(const std::string &line) const +bool WhiteListUtil::IsValidLine(const std::string &line) const { if (line.size() > MAX_CHAR_PER_LINE_NUM) { DHLOGE("This line is too long, size is %d", line.size()); diff --git a/common/include/white_list_util.h b/common/include/white_list_util.h index ea0e926..73724e4 100644 --- a/common/include/white_list_util.h +++ b/common/include/white_list_util.h @@ -68,7 +68,7 @@ private: void GetAllComb(TYPE_COMBINATION_KEY_VEC vecs, WhiteListItemHash hash, int32_t targetLen, std::unordered_set &hashSets); std::string GetBusinessEventHash(const BusinessEvent &event); - bool CheckLine(const std::string &line) const; + bool IsValidLine(const std::string &line) const; bool CheckIsNumber(const std::string &str) const; private: TYPE_DEVICE_WHITE_LIST_MAP mapDeviceWhiteList_;