gfwleak/tango-maat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix coredump because of no compile/group2compile/group2group field in maat_json.json file

Browse Source
This commit is contained in:
liuwentan
2023-03-30 20:49:59 +08:00
parent 4bbd0ebdc4
commit 18881c5bc3
8 changed files with 726 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/json2iris.c
View File

@@ -1094,17 +1094,32 @@ int json2iris(const char *json_buff, const char *json_filename,
tmp_obj = cJSON_GetObjectItem(json, "compile_table");
if (tmp_obj) {
compile_tbl_name = tmp_obj->valuestring;
}
} else {
log_error(logger, MODULE_JSON2IRIS,
"[%s:%d] json file:%s has no [compile_table] field",
__FUNCTION__, __LINE__, json_filename);
goto error_out;
}
tmp_obj = cJSON_GetObjectItem(json, "group2compile_table");
if (tmp_obj) {
group2compile_tbl_name = tmp_obj->valuestring;
}
} else {
log_error(logger, MODULE_JSON2IRIS,
"[%s:%d] json file:%s has no [group2compile_table] field",
__FUNCTION__, __LINE__, json_filename);
goto error_out;
}
tmp_obj = cJSON_GetObjectItem(json, "group2group_table");
if (tmp_obj) {
group2group_tbl_name = tmp_obj->valuestring;
}
} else {
log_error(logger, MODULE_JSON2IRIS,
"[%s:%d] json file:%s has no [group2group_table] field",
__FUNCTION__, __LINE__, json_filename);
goto error_out;
}
ret = set_iris_descriptor(json_filename, json, encrypt_key, encrypt_algo,
compile_tbl_name, group2compile_tbl_name,