Adds sanity check before print action message in the logs

This is a sanity check on top of #1379
This commit is contained in:
Felipe Zimmerle 2017-04-11 10:01:30 -03:00
parent 99eb07d944
commit 45b7706f1f
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277

View File

@ -1889,8 +1889,11 @@ static apr_status_t msre_ruleset_process_phase_(msre_ruleset *ruleset, modsec_re
}
}
else if (rc < 0) {
msr_log(msr, 1, "Rule processing failed (id=%s, msg=%s).", rule->actionset->id, rule->actionset->msg);
if (rule->actionset != NULL && rule->actionset->msg != NULL) {
msr_log(msr, 1, "Rule processing failed (id=%s, msg=%s).", rule->actionset->id, rule->actionset->msg);
} else {
msr_log(msr, 1, "Rule processing failed.");
}
if (msr->txcfg->reqintercept_oe == 1) {
apr_table_clear(msr->matched_vars);
@ -1920,7 +1923,11 @@ static apr_status_t msre_ruleset_process_phase_(msre_ruleset *ruleset, modsec_re
}
}
else {
msr_log(msr, 1, "Rule processing failed with unknown return code: %d (id=%s, msg=%s).", rc, rule->actionset->id, rule->actionset->msg);
if (rule->actionset != NULL && rule->actionset->msg != NULL) {
msr_log(msr, 1, "Rule processing failed with unknown return code: %d (id=%s, msg=%s).", rc, rule->actionset->id, rule->actionset->msg);
} else {
msr_log(msr, 1, "Rule processing failed with unknown return code: %d", rc);
}
apr_table_clear(msr->matched_vars);
return -1;
}