From de9dc909d81bb5a057909f2556c48dbcc66dcf0c Mon Sep 17 00:00:00 2001 From: zhengchao Date: Mon, 19 Dec 2016 10:14:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=89=8D=E8=BF=9B=E8=A1=8Cexpr?= =?UTF-8?q?=E7=B1=BB=E8=A1=A8=E5=8A=A0=E8=BD=BD=E6=97=B6=E7=9A=84=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E6=A0=A1=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entry/Maat_rule.cpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index 166b601..63c537b 100644 --- a/src/entry/Maat_rule.cpp +++ b/src/entry/Maat_rule.cpp @@ -2023,11 +2023,32 @@ void update_expr_rule(struct _Maat_table_info_t* table,const char* table_line,st break; default: MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_module , - "abandon config:update error,invalid hexbin value of expr table %s:%s" + "abandon config %d:update error,invalid hexbin value of expr table %s:%s" + ,maat_str_rule->region_id ,table->table_name[table->updating_name],table_line); table->udpate_err_cnt++; goto error_out; } + if(maat_str_rule->match_methodmatch_method>MATCH_METHOD_FULL) + { + MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_module , + "abandon config %d:update error,invalid match method=%d in expr table %s:%s" + ,maat_str_rule->region_id + ,maat_str_rule->match_method + ,table->table_name[table->updating_name],table_line); + table->udpate_err_cnt++; + goto error_out; + } + if(maat_str_rule->expr_typematch_method>EXPR_TYPE_OFFSET) + { + MESA_handle_runtime_log(logger,RLOG_LV_FATAL,maat_module , + "abandon config %d:update error,invalid expr type=%d in expr table %s:%s" + ,maat_str_rule->region_id + ,maat_str_rule->expr_type + ,table->table_name[table->updating_name],table_line); + table->udpate_err_cnt++; + goto error_out; + } ret=sync_region(scanner->region_hash ,maat_str_rule->region_id ,table->table_name[table->updating_name]