github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed msc_test crash using pcre jit in some platforms

Browse Source
This commit is contained in:
Breno Silva
2013-01-02 17:30:48 -04:00
parent f6bf1a2b92
commit 3f6c14de59
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apache2/re_operators.c
View File

@@ -764,7 +764,8 @@ static int msre_op_validateHash_param_init(msre_rule *rule, char **error_msg) {
"Rule %pp [id \"%s\"][file \"%s\"][line \"%d\"] - " "Rule %pp [id \"%s\"][file \"%s\"][line \"%d\"] - "
"Execution error - " "Execution error - "
"Does not support JIT (%d)", "Does not support JIT (%d)",
rule,((rule->actionset != NULL)&&(rule->actionset->id != NULL)) ? rule->actionset->id : "-", rule,((rule->actionset != NULL)&&((rule->actionset->id != NULL)&&
(rule->actionset->id != NOT_SET_P))) ? rule->actionset->id : "-",
rule->filename != NULL ? rule->filename : "-", rule->filename != NULL ? rule->filename : "-",
rule->line_num,rc); rule->line_num,rc);
} }
@@ -854,7 +855,8 @@ static int msre_op_validateHash_execute(modsec_rec *msr, msre_rule *rule, msre_v
"Rule %pp [id \"%s\"][file \"%s\"][line \"%d\"] - " "Rule %pp [id \"%s\"][file \"%s\"][line \"%d\"] - "
"Execution error - " "Execution error - "
"Does not support JIT (%d)", "Does not support JIT (%d)",
rule,((rule->actionset != NULL)&&(rule->actionset->id != NULL)) ? rule->actionset->id : "-", rule,((rule->actionset != NULL)&&((rule->actionset->id != NULL)&&
(rule->actionset->id != NOT_SET_P))) ? rule->actionset->id : "-",
rule->filename != NULL ? rule->filename : "-", rule->filename != NULL ? rule->filename : "-",
rule->line_num,rc); rule->line_num,rc);
msr_log(msr, 4, "%s.", *error_msg); msr_log(msr, 4, "%s.", *error_msg);
@@ -1005,7 +1007,8 @@ static int msre_op_rx_param_init(msre_rule *rule, char **error_msg) {
"Rule %pp [id \"%s\"][file \"%s\"][line \"%d\"] - " "Rule %pp [id \"%s\"][file \"%s\"][line \"%d\"] - "
"Execution error - " "Execution error - "
"Does not support JIT (%d)", "Does not support JIT (%d)",
rule,((rule->actionset != NULL)&&(rule->actionset->id != NULL)) ? rule->actionset->id : "-", rule,((rule->actionset != NULL)&&((rule->actionset->id != NULL)&&
(rule->actionset->id != NOT_SET_P))) ? rule->actionset->id : "-",
rule->filename != NULL ? rule->filename : "-", rule->filename != NULL ? rule->filename : "-",
rule->line_num,rc); rule->line_num,rc);
} }
@@ -1085,7 +1088,8 @@ static int msre_op_rx_execute(modsec_rec *msr, msre_rule *rule, msre_var *var, c
"Rule %pp [id \"%s\"][file \"%s\"][line \"%d\"] - " "Rule %pp [id \"%s\"][file \"%s\"][line \"%d\"] - "
"Execution error - " "Execution error - "
"Does not support JIT (%d)", "Does not support JIT (%d)",
rule,((rule->actionset != NULL)&&(rule->actionset->id != NULL)) ? rule->actionset->id : "-", rule,((rule->actionset != NULL)&&((rule->actionset->id != NULL)&&
(rule->actionset->id != NOT_SET_P))) ? rule->actionset->id : "-",
rule->filename != NULL ? rule->filename : "-", rule->filename != NULL ? rule->filename : "-",
rule->line_num,rc); rule->line_num,rc);
msr_log(msr, 4, "%s.", *error_msg); msr_log(msr, 4, "%s.", *error_msg);
@@ -2712,7 +2716,8 @@ static int msre_op_verifyCC_execute(modsec_rec *msr, msre_rule *rule, msre_var *
"Rule %pp [id \"%s\"][file \"%s\"][line \"%d\"] - " "Rule %pp [id \"%s\"][file \"%s\"][line \"%d\"] - "
"Execution error - " "Execution error - "
"Does not support JIT (%d)", "Does not support JIT (%d)",
rule,((rule->actionset != NULL)&&(rule->actionset->id != NULL)) ? rule->actionset->id : "-", rule,((rule->actionset != NULL)&&((rule->actionset->id != NULL)&&
(rule->actionset->id != NOT_SET_P))) ? rule->actionset->id : "-",
rule->filename != NULL ? rule->filename : "-", rule->filename != NULL ? rule->filename : "-",
rule->line_num,rc); rule->line_num,rc);
msr_log(msr, 4, "%s.", *error_msg); msr_log(msr, 4, "%s.", *error_msg);
@@ -3020,7 +3025,8 @@ static int msre_op_verifyCPF_execute(modsec_rec *msr, msre_rule *rule, msre_var
"Rule %pp [id \"%s\"][file \"%s\"][line \"%d\"] - " "Rule %pp [id \"%s\"][file \"%s\"][line \"%d\"] - "
"Execution error - " "Execution error - "
"Does not support JIT (%d)", "Does not support JIT (%d)",
rule,((rule->actionset != NULL)&&(rule->actionset->id != NULL)) ? rule->actionset->id : "-", rule,((rule->actionset != NULL)&&((rule->actionset->id != NULL)&&
(rule->actionset->id != NOT_SET_P))) ? rule->actionset->id : "-",
rule->filename != NULL ? rule->filename : "-", rule->filename != NULL ? rule->filename : "-",
rule->line_num,rc); rule->line_num,rc);
msr_log(msr, 4, "%s.", *error_msg); msr_log(msr, 4, "%s.", *error_msg);
@@ -3311,7 +3317,8 @@ static int msre_op_verifySSN_execute(modsec_rec *msr, msre_rule *rule, msre_var
"Rule %pp [id \"%s\"][file \"%s\"][line \"%d\"] - " "Rule %pp [id \"%s\"][file \"%s\"][line \"%d\"] - "
"Execution error - " "Execution error - "
"Does not support JIT (%d)", "Does not support JIT (%d)",
rule,((rule->actionset != NULL)&&(rule->actionset->id != NULL)) ? rule->actionset->id : "-", rule,((rule->actionset != NULL)&&((rule->actionset->id != NULL)&&
(rule->actionset->id != NOT_SET_P))) ? rule->actionset->id : "-",
rule->filename != NULL ? rule->filename : "-", rule->filename != NULL ? rule->filename : "-",
rule->line_num,rc); rule->line_num,rc);
msr_log(msr, 4, "%s.", *error_msg); msr_log(msr, 4, "%s.", *error_msg);