Commit45b7706

Felipe Zimmerle

committed

Adds sanity check before print action message in the logs

This is a sanity check on top ofowasp-modsecurity#1379

1 parent99eb07d commit45b7706Copy full SHA for 45b7706

File tree

+10

-3

lines changed

+10

-3

lines changed

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1889,8 +1889,11 @@ static apr_status_t msre_ruleset_process_phase_(msre_ruleset *ruleset, modsec_re`
`1889`	`1889`	`}`
`1890`	`1890`	`}`
`1891`	`1891`	`elseif (rc<0) {`
`1892`		`-msr_log(msr,1,"Rule processing failed (id=%s, msg=%s).",rule->actionset->id,rule->actionset->msg);`
`1893`		`-`
	`1892`	`+if (rule->actionset!=NULL&&rule->actionset->msg!=NULL) {`
	`1893`	`+msr_log(msr,1,"Rule processing failed (id=%s, msg=%s).",rule->actionset->id,rule->actionset->msg);`
	`1894`	`+ }else {`
	`1895`	`+msr_log(msr,1,"Rule processing failed.");`
	`1896`	`+ }`
`1894`	`1897`
`1895`	`1898`	`if (msr->txcfg->reqintercept_oe==1) {`
`1896`	`1899`	`apr_table_clear(msr->matched_vars);`
`@@ -1920,7 +1923,11 @@ static apr_status_t msre_ruleset_process_phase_(msre_ruleset *ruleset, modsec_re`
`1920`	`1923`	`}`
`1921`	`1924`	`}`
`1922`	`1925`	`else {`
`1923`		`-msr_log(msr,1,"Rule processing failed with unknown return code: %d (id=%s, msg=%s).",rc,rule->actionset->id,rule->actionset->msg);`
	`1926`	`+if (rule->actionset!=NULL&&rule->actionset->msg!=NULL) {`
	`1927`	`+msr_log(msr,1,"Rule processing failed with unknown return code: %d (id=%s, msg=%s).",rc,rule->actionset->id,rule->actionset->msg);`
	`1928`	`+ }else {`
	`1929`	`+msr_log(msr,1,"Rule processing failed with unknown return code: %d",rc);`
	`1930`	`+ }`
`1924`	`1931`	`apr_table_clear(msr->matched_vars);`
`1925`	`1932`	`return-1;`
`1926`	`1933`	`}`

Comments

(0)