openharmony/developtools_global_resource_tool
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_global_resource_tool.git synced 2026-07-18 17:24:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

!187 安全告警修改

Browse Source 
Merge pull request !187 from 高超/1105
This commit is contained in:
openharmony_ci
2024-11-06 01:37:11 +00:00
committed by Gitee
parent 4d897b8e08 bf571c16a0
commit a8926b7797
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/json_compiler.cpp
+11
View File
@@ -187,6 +187,11 @@ bool JsonCompiler::HandleInteger(const cJSON *objectNode, ResourceItem &resource
bool JsonCompiler::HandleBoolean(const cJSON *objectNode, ResourceItem &resourceItem) const
{
cJSON *valueNode = cJSON_GetObjectItem(objectNode, TAG_VALUE.c_str());
if (valueNode == nullptr) {
cerr << "Error: '" << resourceItem.GetName() << "' value not json.";
cerr << NEW_LINE_PATH << resourceItem.GetFilePath() << endl;
return false;
}
if (cJSON_IsString(valueNode)) {
regex ref("^\\$(ohos:)?boolean:.*");
if (!regex_match(valueNode->valuestring, ref)) {
@@ -404,6 +409,12 @@ bool JsonCompiler::ParseValueArray(const cJSON *objectNode, ResourceItem &resour
const vector<string> &extra, HandleValue callback) const
{
cJSON *arrayNode = cJSON_GetObjectItem(objectNode, TAG_VALUE.c_str());
if (arrayNode == nullptr) {
cerr << "Error: '" << resourceItem.GetName() << "' value not json.";
cerr << NEW_LINE_PATH << resourceItem.GetFilePath() << endl;
return false;
}
if (!cJSON_IsArray(arrayNode)) {
cerr << "Error: '" << resourceItem.GetName() << "' value not array.";
cerr << NEW_LINE_PATH << resourceItem.GetFilePath() << endl;