Commit966e7e1

Felipe Zimmerle

committed

Adds verification before access the strcmp

Audit log was making the assumption that "arg->origin" was filled whichis not necessary true. This commit adds an verification.

1 parentc5c2690 commit966e7e1Copy full SHA for 966e7e1

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ static int sec_auditlog_write(modsec_rec msr, const char data, unsigned int le`
`53`	`53`
`54`	`54`	`msr_log(msr,1,"Audit log: Failed writing (requested %"APR_SIZE_T_FMT`
`55`	`55`	`" bytes, written %"APR_SIZE_T_FMT"): %s",nbytes,nbytes_written,`
`56`		`-apr_strerror(rc,errstr,sizeof(errstr));`
	`56`	`+apr_strerror(rc,errstr,sizeof(errstr)));`
`57`	`57`
`58`	`58`	`/* Concurrent log format: don't leak file handle. */`
`59`	`59`	`if (msr->txcfg->auditlog_type==AUDITLOG_CONCURRENT) {`
`@@ -704,7 +704,9 @@ void sec_audit_logger(modsec_rec *msr) {`
`704`	`704`	`telts= (constapr_table_entry_t*)tarr->elts;`
`705`	`705`	`for(i=0;i<tarr->nelts;i++) {`
`706`	`706`	`msc_argarg= (msc_arg)telts[i].val;`
`707`		`-if (strcmp(arg->origin,"BODY")!=0)continue;`
	`707`	`+if (arg->origin!=NULL&&`
	`708`	`+strcmp(arg->origin,"BODY")!=0)`
	`709`	`+continue;`
`708`	`710`
`709`	`711`	`if (last_offset==0) {/* The first time we're here. */`
`710`	`712`	`if (arg->value_origin_offset>offset) {`

Comments

(0)