openharmony/distributedhardware_distributed_input
1
0
Fork 0
mirror of https://github.com/openharmony/distributedhardware_distributed_input.git synced 2026-07-19 09:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

!34 json反序列化增加校验

Browse Source 
Merge pull request !34 from 李天刚/master
This commit is contained in:
openharmony_ci
2023-06-25 06:35:15 +00:00
committed by Gitee
parent ba662afbf8 01231e9246
commit 9d8f0c8b76
4 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/sink/transport/src/distributed_input_sink_transport.cpp
+8
View File
@@ -463,6 +463,14 @@ void DistributedInputSinkTransport::HandleData(int32_t sessionId, const std::str
}
nlohmann::json recMsg = nlohmann::json::parse(message, nullptr, false);
if (recMsg.is_discarded()) {
DHLOGE("recMsg parse failed!");
return;
}
if (!IsUInt32(recMsg, DINPUT_SOFTBUS_KEY_CMD_TYPE)) {
DHLOGE("softbus cmd key is invalid");
return;
}
uint32_t cmdType = recMsg[DINPUT_SOFTBUS_KEY_CMD_TYPE];
auto iter = memberFuncMap_.find(cmdType);
if (iter == memberFuncMap_.end()) {
services/source/transport/src/distributed_input_source_transport.cpp
+8
View File
@@ -1470,6 +1470,14 @@ void DistributedInputSourceTransport::HandleData(int32_t sessionId, const std::s
}
nlohmann::json recMsg = nlohmann::json::parse(message, nullptr, false);
if (recMsg.is_discarded()) {
DHLOGE("recMsg parse failed!");
return;
}
if (!IsUInt32(recMsg, DINPUT_SOFTBUS_KEY_CMD_TYPE)) {
DHLOGE("softbus cmd key is invalid");
return;
}
uint32_t cmdType = recMsg[DINPUT_SOFTBUS_KEY_CMD_TYPE];
auto iter = memberFuncMap_.find(cmdType);
if (iter == memberFuncMap_.end()) {
services/transportbase/src/distributed_input_transport_base.cpp
+8
View File
@@ -412,6 +412,14 @@ void DistributedInputTransportBase::HandleSession(int32_t sessionId, const std::
return;
}
nlohmann::json recMsg = nlohmann::json::parse(message, nullptr, false);
if (recMsg.is_discarded()) {
DHLOGE("recMsg parse failed!");
return;
}
if (!IsUInt32(recMsg, DINPUT_SOFTBUS_KEY_CMD_TYPE)) {
DHLOGE("softbus cmd key is invalid");
return;
}
uint32_t cmdType = recMsg[DINPUT_SOFTBUS_KEY_CMD_TYPE];
DHLOGI("HandleSession cmdType %u.", cmdType);
if (cmdType < TRANS_MSG_SRC_SINK_SPLIT) {
utils/src/dinput_utils_tool.cpp
+1 -1
View File
@@ -45,6 +45,7 @@ namespace {
constexpr int32_t WIDTH = 4;
constexpr unsigned char MASK = 0x0F;
constexpr int32_t DOUBLE_TIMES = 2;
constexpr int32_t INT32_STRING_LENGTH = 40;
}
DevInfo GetLocalDeviceInfo()
{
@@ -248,7 +249,6 @@ std::string GetAnonyString(const std::string &value)
std::string GetAnonyInt32(const int32_t value)
{
constexpr int32_t INT32_STRING_LENGTH = 40;
char tempBuffer[INT32_STRING_LENGTH] = "";
int32_t secRet = sprintf_s(tempBuffer, INT32_STRING_LENGTH, "%d", value);
if (secRet <= 0) {